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

[Dan Mashal]

commit 8dcee8f1de8f480b677b84b70d37657511efeb5d
Merge: 58560c2 d99c09a
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sun Sep 9 21:58:31 2012 -0700

    Merge branch 'master' into f18

 .gitignore               |    1 +
 mate-window-manager.spec |   40 +++++++++++++++++++++++++---------------
 sources                  |    2 +-
 3 files changed, 27 insertions(+), 16 deletions(-)
---