commit 79b3fcef53122974fa606c27584b19a9e470ac44 Merge: 11b83ac 9ca8528 Author: Nils Philippsen <nils at redhat.com> Date: Thu Dec 15 15:44:56 2011 +0100 Merge branch 'master' into master--2.7 ---