Merge remote-tracking branch 'stefanha/trivial-patches' into staging
commitb1d7d2b93a1d6b2d2848b616cc35acdf521c923c
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 31 May 2011 13:23:11 +0000 (31 08:23 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 31 May 2011 13:23:11 +0000 (31 08:23 -0500)
treedd3336b7a65191b019894855dc34b1e929207267
parentede77d297fb79263af866d302dd307af7ceb04fd
parent06ea77bc505b2e41cc42c8c4b39d08ec638a82e8
Merge remote-tracking branch 'stefanha/trivial-patches' into staging