commit 257c3ba4e80d5c1933780bfa902ad114d0947261 Merge: 2135f15 0cbd666 Author: Nils Philippsen <nils at redhat.com> Date: Thu Aug 12 11:24:33 2010 +0200 Merge branch 'master' into f14 ---