[mate-desktop/f18: 2/2] Merge branch 'master' into f18

[leigh123linux]

commit ec032a88caccaf833fbd2f823799ab09f4fba6d4
Merge: c29f048 1b5d291
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Nov 25 20:45:21 2012 +0000

    Merge branch 'master' into f18

 .gitignore           |    1 +
 commits_rollup.patch | 1884 --------------------------------------------------
 mate-desktop.spec    |   14 +-
 sources              |    2 +-
 4 files changed, 11 insertions(+), 1890 deletions(-)
---