[clutter/f16: 3/3] Merge branch 'master' into f16

[Peter Robinson]

commit e4bcc53f7b2f028a97fbce6ca7de142355a9f9fd
Merge: a6a443e f76ad53
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Sep 20 00:51:43 2011 +0100

    Merge branch 'master' into f16

 .gitignore   |    1 +
 clutter.spec |    6 +++++-
 sources      |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---