commit 86f7c65256239020b8127c699565f4b733d3d724 Merge: c1967a3 63764f0 Author: Matthias Clasen <mclasen at redhat.com> Date: Wed Aug 18 14:41:37 2010 -0400 Fix merge conflicts ---