[libqb/f15: 2/2] Merge branch 'master' into f15

[Angus Salkeld]

commit bdd17bdf438281cc2312392168606ae66b02f2d3
Merge: 22daec6 6b89563
Author: Angus Salkeld <asalkeld at redhat.com>
Date:   Thu Nov 17 12:43:09 2011 +1100

    Merge branch 'master' into f15

 .gitignore |    1 +
 libqb.spec |   11 +++++------
 sources    |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
---