[knights/f14: 3/3] Merge branches 'master' and 'f14' into f14

[Julian Aloofi]

commit c3ff3e7900803051da0108f1ea0ec3ae4ca04f3d
Merge: b67af50 53794af
Author: Julian Aloofi <julian.fedora at googlemail.com>
Date:   Sun Jul 3 18:12:47 2011 +0200

    Merge branches 'master' and 'f14' into f14

 .gitignore   |    1 +
 knights.spec |    7 +++++--
 sources      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---