Merge commit 'origin/next' into kvm-ppc-next
authorAlexander Graf <agraf@suse.de>
Wed, 27 Mar 2013 12:41:35 +0000 (13:41 +0100)
committerAlexander Graf <agraf@suse.de>
Wed, 27 Mar 2013 12:41:35 +0000 (13:41 +0100)

Trivial merge