Merge commit 'origin/next' into kvm-ppc-next
authorAlexander Graf <agraf@suse.de>
Wed, 13 Feb 2013 11:56:14 +0000 (12:56 +0100)
committerAlexander Graf <agraf@suse.de>
Wed, 13 Feb 2013 11:56:14 +0000 (12:56 +0100)

Trivial merge