[mate-desktop/f16: 8/8] Merge branch 'master' into f16

[Dan Mashal]

commit b085130cb30fb852b88e5390c7d7d071a15c1e9f
Merge: e1721ea 517a1a2
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Sat Nov 24 21:46:59 2012 -0800

    Merge branch 'master' into f16

 commits_rollup.patch | 1884 ++++++++++++++++++++++++++++++++++++++++++++++++++
 mate-desktop.spec    |   27 +-
 2 files changed, 1901 insertions(+), 10 deletions(-)
---