Merge branch 'develop' into debian/wheezy

diff --cc .gitignore
index 22db6e98ebd9995029ed34625365ee7e204b30e7,5196c170f65e9d754f7f57f661a74fcbd9989ca6..585d31958e49dbcec08e399e829eee9a07a0a3d2
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -63,6 -63,7 +63,8 @@@ Rules-quo
  *.exe
  compile
  gtk-doc.m4
 +build/
  src/lexycal.yy.[ch]
  src/rptmarshal.[ch]
 -*.typelib
+ *.gir
++*.typelib