commit f959751842d86ff81c88b839674df8e758de1db1 Merge: c4082d4 8b78524 Author: Nils Philippsen <nils at redhat.com> Date: Mon Nov 19 18:05:58 2012 +0100 Merge branch 'f18' ---