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

[Robert Scheck]

commit eaae7a19ed5fcd0b2b853f19c5c957b0e98a5fc3
Merge: f32dea0 be29f48
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 10 13:26:30 2011 +0200

    Merge remote branch 'origin/master' into el5

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