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

[Robert Scheck]

commit e6c6b934adc12695c7eaeb4cb2ac68adaf8b3689
Merge: d2f781b 84c1404
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Mar 19 20:38:15 2013 +0100

    Merge remote branch 'origin/master' into el5

 libburn.spec |   11 ++++++++---
 sources      |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)
---