[mate-window-manager/f17: 2/2] Merge branch 'master' into f17

[Dan Mashal]

commit d68d5f4b061460148ab7bc7090a288e948b027b9
Merge: e75e9a5 6957301
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Sep 3 00:31:42 2012 -0700

    Merge branch 'master' into f17

 .gitignore               |    1 +
 mate-window-manager.spec |   52 +++++++++++++++++++++++++++------------------
 sources                  |    2 +-
 3 files changed, 33 insertions(+), 22 deletions(-)
---