[mate-control-center/f16: 2/2] Merge branch 'master' into f16

[Dan Mashal]

commit f2d5a370db91477ea11444c79f0f9c590cb467d4
Merge: 6f24f1c 6fc0424
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Jan 15 15:16:07 2013 -0800

    Merge branch 'master' into f16

 .gitignore               |    1 +
 mate-control-center.spec |   14 +-
 sources                  |    2 +-
 titlebar_actions.patch   |  387 ----------------------------------------------
 4 files changed, 8 insertions(+), 396 deletions(-)
---