commit a9809281b2b5d86f468d9c32f11ca761476b85c8 Merge: ae48277 a2e61fb Author: Tim Lauridsen <timlau at fedoraproject.org> Date: Sun May 13 08:09:10 2012 +0200 fix merge errors ---