Merge branch 'develop' into debian/wheezy

diff --cc .gitignore
index b1708355c55d5164868d7049ad11a1794215fbc9,c5af0fdc32a2cbc0abfb1a2ae2db4ecb6fee3e2e..37065a0b4939a3932569dd1752b0d8f2ca984aee
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -51,4 -61,6 +61,7 @@@ Rules-quo
  *.exe
  *.csv
  src/*marshal*.[ch]
+ test-driver
+ *.gir
+ *.typelib
 +build/