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

[Robert Scheck]

commit c8cbdf7c7045ce997e9c631a7e8d0a563d9c51e0
Merge: 39a36c6 8c9e90a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Nov 27 00:11:14 2011 +0100

    Merge remote branch 'origin/master' into el4

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