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

[leigh123linux]

commit 438bd5da59e54727022f9bec541adf69494d537d
Merge: 8724f04 b5802bd
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Nov 15 17:57:25 2012 +0000

    Merge branch 'master' into f18

 mate-desktop.spec |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---