commit 1b5f42431db0a6a8c39b5e06d37b98a3776931b6 Merge: d3d5511 b21a843 Author: Nils Philippsen <nils at redhat.com> Date: Tue Aug 24 14:50:24 2010 +0200 Merge branch 'f14' ---