[mate-common/f16: 6/6] Merge branch 'master' into f16

[Dan Mashal]

commit deffca39099b41c859d283813a09aaea6cebaa3b
Merge: 73fb04d 0866eed
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Tue Jul 24 16:18:20 2012 -0700

    Merge branch 'master' into f16
    
    Conflicts:
    	mate-common.spec

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