[cogl: 2/2] fix merge

[Peter Robinson]

commit 0826730fb0d33f321a684fe787f1d24ecdccfea5
Merge: 33bebca 8b91223
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Mar 13 19:20:37 2012 +0000

    fix merge

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