commit 4c62fa7a54ea7589397fa149a4933e82a3ffd1db Merge: 8a6445c f139788 Author: Matthias Clasen <mclasen at redhat.com> Date: Thu Sep 30 09:09:09 2010 -0400 merge ---