[shared-mime-info: 6/7] Merge remote-tracking branch 'origin/f16'

[Rex Dieter]

commit 250682f4046d1006f83f2f49cc201562a209f96f
Merge: ea3701c e108a6a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 24 13:48:41 2011 -0500

    Merge remote-tracking branch 'origin/f16'
    
    Conflicts:
    	shared-mime-info.spec

 defaults.list         |    6 +++---
 shared-mime-info.spec |    8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)
---