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

[Dan Mashal]

commit 58560c2831bbc12eee4b29e132ea31fe504ea3d7
Merge: 7a20a32 832d322
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Sep 3 06:37:30 2012 -0700

    Merge branch 'master' into f18

 mate-window-manager.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---