[jhead/f13/master: 2/2] Merge branch 'master' into f13

[Adrian Reber]

commit 8c252f1ebad35c79305b05d13fee3583da6d97d2
Merge: d25a13b a49b41d
Author: Adrian Reber <adrian at lisas.de>
Date:   Tue Nov 30 13:30:25 2010 +0100

    Merge branch 'master' into f13

 jhead-orientation-crash.patch |   11 +++++++++++
 jhead.spec                    |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---