commit 6738ff58b5cad6883543c2df0f9cb784514582a0 Merge: b81baa5 ddb82e0 Author: Mark McLoughlin <markmc at redhat.com> Date: Mon Oct 24 08:27:20 2011 +0100 Merge branch 'master' into el6 ---