Merge commit 'origin/next' into kvm-ppc-next
authorAlexander Graf <agraf@suse.de>
Fri, 15 Feb 2013 00:12:59 +0000 (01:12 +0100)
committerAlexander Graf <agraf@suse.de>
Fri, 15 Feb 2013 00:12:59 +0000 (01:12 +0100)

Trivial merge