commit a6309ee7bbf5c931d7f352633594b9d0f6fbb35a Merge: 961af25 e702fa3 Author: Nils Philippsen <nils at redhat.com> Date: Mon Oct 4 11:32:30 2010 +0200 Merge branch 'f12' ---