Merge branch 'master' into pm-utils-1.2
authorVictor Lowther <victor.lowther@gmail.com>
Sun, 8 Nov 2009 05:51:04 +0000 (23:51 -0600)
committerVictor Lowther <victor.lowther@gmail.com>
Sun, 8 Nov 2009 05:51:04 +0000 (23:51 -0600)
commit51afe0cac4d540116c48949f65e16c141d6b0ade
treefb5bb313b3a0181ce3ebac0ca05eb358a7ae05a5
parent054668a461347514034b88eef24f902b69d55d5b
parent6014e54b7f007109616965ff601ff05ea6fc397a
Merge branch 'master' into pm-utils-1.2