[midori/f16: 2/2] Merge branch 'master' into f16

[Christoph Wickert]

commit 8a5f140d5c38f6620dc0abed812f4f16962117e4
Merge: 4dd427a 711a117
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Dec 18 02:02:56 2011 +0100

    Merge branch 'master' into f16

 .gitignore  |    1 +
 midori.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---