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

[Robert Scheck]

commit 5ade624165c5bab2cc2a7dad06c0346b50751032
Merge: 3128a0f 79d2ca3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 8 14:28:39 2011 +0200

    Merge remote branch 'origin/master' into el5

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