commit 611164969dca7b50ddbf86957c2a637f716f5122 Merge: 6d68203 d01f211 Author: Nils Philippsen <nils at redhat.com> Date: Wed Nov 3 15:30:21 2010 +0100 Merge branch 'f12' ---