[mate-mime-data/f17: 4/4] Merge branch 'master' into f17

[Dan Mashal]

commit 0cb98bf9be0c6d2b8cbfc266c4c914de7082ed0c
Merge: 5e29e08 55921d0
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Sun Aug 26 17:44:39 2012 -0700

    Merge branch 'master' into f17
    
    Conflicts:
    	mate-mime-data.spec

 mate-mime-data.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---