commit 22a1781ba60a2341aef069a995616346c2f11f35 Merge: b9e66da... 4504037... Author: Douglas Silas <dhensley at redhat.com> Date: Sun Jun 20 23:39:04 2010 +0200 Merge branch 'martin' ---