[viking/f16: 10/10] Merge branch 'f17' into f16

[Fabian Affolter]

commit 694aaaf6ac7c04fd6f001a7b37275fdd846288db
Merge: db753c8 b958b7c
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sun Jul 15 18:40:31 2012 +0200

    Merge branch 'f17' into f16

 .gitignore  |    2 ++
 sources     |    2 +-
 viking.spec |   36 ++++++++++++++++++++++--------------
 3 files changed, 25 insertions(+), 15 deletions(-)
---