[mate-common/f17: 6/6] Merge remote-tracking branch 'origin' into f17

[Dan Mashal]

commit 9d3ff902841d704d5fe007e8b31da2a0f277f564
Merge: 15d1adb 0866eed
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Tue Jul 24 16:13:10 2012 -0700

    Merge remote-tracking branch 'origin' into f17
    
    Conflicts:
    	mate-common.spec

 mate-common.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---