commit b6586aaac234276066666c92a090f6f74f1d9230 Merge: d363712 ae0dd8e Author: Alasdair G Kergon <agk at redhat.com> Date: Mon Aug 2 22:23:32 2010 +0100 Merge branch 'f12/master' ---