[jhead/f13/master: 3/4] Merge branch 'master' into f13

[Adrian Reber]

commit 13797b4fd031a20091a4c5ca9d8cfe30560f9960
Merge: bff587e 98f8c4b
Author: Adrian Reber <adrian at lisas.de>
Date:   Wed Aug 4 20:37:32 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

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