[libmowgli/f16: 4/4] Merge branch 'master' into f16

[Michael Schwendt]

commit f9439e46401d38fee0a416b2e9ef0758634e7c81
Merge: e8874bc a0eb1aa
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Dec 9 12:19:38 2011 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	libmowgli.spec

 .gitignore     |    2 ++
 libmowgli.spec |   14 ++++++++++++--
 sources        |    2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)
---