commit 2e1d71fffd29b2d2af2eeb396249a09231df79ce Merge: 1c5d358 3c73e4f Author: Pádraig Brady <P at draigBrady.com> Date: Fri Jul 20 13:31:08 2012 +0100 Merge branch 'master' into el6 Conflicts: cloud-init.spec ---