[libburn/el4/master: 17/17] Merge branch 'master' into el4

[Jan Horak]

commit 59b5f985d59315e0bee1b8f477771847c98267f5
Merge: 49f0103 2867377
Author: Honza Horak <hhorak at redhat.com>
Date:   Mon Feb 28 12:41:10 2011 +0100

    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore

 libburn.spec |   65 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 sources      |    2 +-
 2 files changed, 55 insertions(+), 12 deletions(-)
---