commit 34c2163beb61e36bca654957bb8bfdfcd774a371 Merge: 688c38f 46d3eaf Author: Nils Philippsen <nils at redhat.com> Date: Tue Apr 5 14:16:21 2011 +0200 Merge branch 'f13' ---