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

[Angus Salkeld]

commit 619949ea6bf0bef1b1064651b5eb8a5e6e8ead77
Merge: bdd17bd 7d0c52d
Author: Angus Salkeld <asalkeld at redhat.com>
Date:   Thu Jan 5 23:13:19 2012 +1100

    Merge branch 'master' into f15

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