[libburn/el5: 3/3] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 3b9985d7a934629e4a17fd417c0026770e6afecd
Merge: a84c4b4 e1c0a9b
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun May 13 13:05:03 2012 +0200

    Merge remote branch 'origin/master' into el5

 .gitignore   |    2 +-
 libburn.spec |    8 +++++++-
 sources      |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---