[gummi/f15/master: 3/3] Merge branch 'master' into f15

[Fabian Affolter]

commit 5dc49e41d9ecc3f1b0135e3d28fcbb4c99232d61
Merge: c84c6c6 9fba817
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Wed Mar 23 20:40:45 2011 +0100

    Merge branch 'master' into f15

 .gitignore |    1 +
 gummi.spec |    9 ++++++---
 sources    |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---