[metacity/f17: 3/3] merge master

[Michael Schwendt]

commit 21b171faad69b9f036218ddb3a839c9a0b3593bd
Merge: b656d9e 46bd293
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Feb 18 12:11:40 2012 +0100

    merge master

 metacity.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---