[pygobject3: 4/4] Merge branch 'f16'

[Ignacio Casal Quinteiro]

commit 2cafc2e14704c6fb9416ad154ea7618c931ffe99
Merge: b8396d7 55a7821
Author: Ignacio Casal Quinteiro <icq at gnome.org>
Date:   Wed Aug 31 18:48:50 2011 +0200

    Merge branch 'f16'
    
    Conflicts:
    	.gitignore
    	pygobject3.spec
    	sources

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