commit 0a052b0c4041d4319358f17bbabeddb0dfa21b21 Merge: 51037d2 6fa9005 Author: Nils Philippsen <nils at redhat.com> Date: Fri Aug 12 12:38:48 2011 +0200 Merge branch 'f14' ---