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

[Peter Robinson]

commit 20181a08d67766e02bbf3ecc59f7d6a686f1f354
Merge: 38229e6 c4959f8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Sep 20 00:50:41 2011 +0100

    Merge branch 'master' into f16

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