commit f17a70eb284b30585d2a78e79aea62c741ba6f11 Merge: 43a37ed 25e444f Author: Nils Philippsen <nils at redhat.com> Date: Mon Jan 9 17:02:45 2012 +0100 Merge branch 'master' into f16 ---