commit 7034f4f359f3541ee687f1093462c404f7738c45 Merge: 448a435 fc55989 Author: Nils Philippsen <nils at redhat.com> Date: Wed Jan 26 17:47:27 2011 +0100 Merge branch 'f13' ---