Merge commit 'origin/master' into kvm-ppc-3.8

This commit is contained in:
Alexander Graf 2013-01-06 14:02:03 +01:00
commit d686a54763