[mate-conf/f16: 20/20] Merge branch 'master' into f16

[Dan Mashal]

commit 091c9a84ff8cc8ced38e79a9b87e561968aba6a0
Merge: 23dd3b4 4ef123a
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Dec 3 23:40:26 2012 -0800

    Merge branch 'master' into f16

 mate-conf.spec |  200 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 115 insertions(+), 85 deletions(-)
---