OSDN Git Service

Merge remote branch 'origin/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 23 Apr 2010 18:48:33 +0000 (13:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 23 Apr 2010 18:48:33 +0000 (13:48 -0500)

Trivial merge