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

[Robert Scheck]

commit 3128a0fe3527e58f57298fdb2b3d47da94072021
Merge: eaae7a1 3c5c7d1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Sep 18 14:36:27 2011 +0200

    Merge remote branch 'origin/master' into el5

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