[midori/f16: 3/3] Merge remote-tracking branch 'origin/master' into f16

[Kevin Fenzi]

commit 6f573dbab21abb33f696a9ed66b0c777583930e5
Merge: 8a5f140 983b7fc
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Thu Mar 8 17:13:04 2012 -0700

    Merge remote-tracking branch 'origin/master' into f16

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