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

[Peter Robinson]

commit 58c9ce2c79c2e7a1711d190446a1df48638f1973
Merge: 20181a0 5cfb987
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Oct 17 16:42:33 2011 +0100

    Merge branch 'master' into f16

 .gitignore |    1 +
 cogl.spec  |   13 ++++++++++---
 sources    |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---