[libburn/f13/master: 3/3] Merge remote branch 'origin/master' into f13

[Robert Scheck]

commit 556159036ccdcfabf3a9541e4b467d1ebdeb6165
Merge: fc6c08c 2a5b7ad
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Apr 17 17:56:01 2011 +0200

    Merge remote branch 'origin/master' into f13
    
    Conflicts:
    	.gitignore

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