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

[Fabian Affolter]

commit 77970cf1168fac103abebb3ed0c703200f1b5b98
Merge: 5dc49e4 1eadefa
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Apr 7 10:34:23 2012 +0200

    Merge branch 'master' into f15

 .gitignore |    3 ++
 gummi.spec |   63 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 sources    |    2 +-
 3 files changed, 53 insertions(+), 15 deletions(-)
---