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

[Robert Scheck]

commit 1a8f526b39c06f628a8bbc7781b163b6eba39d09
Merge: 5f8f4d5 3c5c7d1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Sep 18 14:37:06 2011 +0200

    Merge remote branch 'origin/master' into el4

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