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

[Robert Scheck]

commit a84c4b49a8bc4c9931006f1cb39d524a77520344
Merge: 5ade624 8c9e90a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Nov 27 00:10:53 2011 +0100

    Merge remote branch 'origin/master' into el5

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