Merge remote branch 'UPSTREAM/pm-utils-1.4' into pm-utils-1.4
authorVictor Lowther <victor.lowther@gmail.com>
Sat, 19 Jun 2010 23:10:00 +0000 (18:10 -0500)
committerVictor Lowther <victor.lowther@gmail.com>
Sat, 19 Jun 2010 23:10:00 +0000 (18:10 -0500)
commit646a20af9b48d1bb4630f237a345e82ffb2921b5
treeefe8cb8d850a3d79a45dbc714d236283f801203a
parent1fd247d087ed73896d2b2156039dff2a353f6db6
parent79dde6f2f7bb620b163981ec7a7b995c9c9d1b0e
Merge remote branch 'UPSTREAM/pm-utils-1.4' into pm-utils-1.4