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

[Dan Mashal]

commit e76ac82fcd399b5757799c2026177af84431fc36
Merge: b226eb6 38e6ef4
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sat Sep 15 21:09:34 2012 -0700

    Merge branch 'master' into f17

 .gitignore               |    2 +
 mate-window-manager.spec |   50 ++++++++++++++++++++++++++++-----------------
 sources                  |    2 +-
 3 files changed, 34 insertions(+), 20 deletions(-)
---