commit bede735589192e8d182c6a2e30e0e4b5538cb3d2 Merge: 17f9881 238833d Author: Nils Philippsen <nils at redhat.com> Date: Wed Sep 15 14:52:36 2010 +0200 Merge branch 'f13' ---