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

[Julian Aloofi]

commit 945511b419a38d0cc8e1f175c98bfe3ac2e76df7
Merge: 2bd7746 de02d9a
Author: Julian Aloofi <julian.fedora at googlemail.com>
Date:   Wed Dec 28 17:39:44 2011 +0100

    Merge branches 'master' and 'f15' into f15

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