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

[Kevin Fenzi]

commit 4dd427a22e8c17875132d364e215aea963a44411
Merge: b3f97f2 ee23b36
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sat Nov 12 16:01:31 2011 -0700

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	midori.spec

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