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

[Robert Scheck]

commit 5f8f4d585a63095be741537ca678339d2a58205a
Merge: ea2159e be29f48
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 10 13:27:15 2011 +0200

    Merge remote branch 'origin/master' into el4

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