commit 961af2505c18b15b256b3e0e748bf6ffcc49f72d Merge: 047c5c8 5bd9213 Author: Nils Philippsen <nils at redhat.com> Date: Mon Oct 4 11:32:27 2010 +0200 Merge branch 'f13' ---