commit dadfc06bf37bc9079fed3dad045a44eef5986a30 Merge: 132d563 4345b03 Author: Nils Philippsen <nils at redhat.com> Date: Thu Oct 27 12:57:01 2011 +0200 Merge branch 'master' into f16 ---