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

[Peter Robinson]

commit 8a5b3b68121c092101018e8f05284766906a0ac1
Merge: e4bcc53 26fff65
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Oct 17 14:39:41 2011 +0100

    Merge branch 'master' into f16

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