commit 22daec6d15d02f2e940f9052ca95bf4049491521 Merge: b26a5d4 949daca Author: Angus Salkeld <asalkeld at redhat.com> Date: Fri Sep 16 12:14:04 2011 +1000 Merge branch 'master' into f15 ---