[fawkes: 3/3] Merge branch 'master' into f14

[Tim Niemueller]

commit 5981a9f3a744aa7c9f5c88127b1d701de58f7551
Merge: f590c11 bbda990
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Tue Feb 22 14:02:16 2011 +0100

    Merge branch 'master' into f14

 .gitignore  |    3 +--
 fawkes.spec |   22 +++++++++++++++++-----
 sources     |    2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)
---