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

[Robert Scheck]

commit 39a36c6ef627c09b5f56682ccc198bc28fe89143
Merge: 1a8f526 79d2ca3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 8 14:29:19 2011 +0200

    Merge remote branch 'origin/master' into el4

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