commit cbc26d3d1a01424a0e3f7a285ec97678e0081a3b Merge: 73c6efd 85e36aa Author: Adam Williamson <awilliam at redhat.com> Date: Fri Nov 11 18:32:42 2011 -0800 Merge commit '85e36aa45d060e465016645027c2f87852480985' into f15 ---