commit 22fd3d12d04ef804cc59d23a4b3fba9d090ce810 Merge: 7e7f759 6b2ca1a Author: Mark McLoughlin <markmc at redhat.com> Date: Mon Mar 26 09:36:28 2012 +0100 Merge branch 'f17' ---