Merge branch 'develop' into debian/wheezy

diff --cc .gitignore
index bc98ac78d5d0a1cdc59fc885e8707589445d4e2c,de7188b0d30489264b1e64922d4df06d56d1ca7e..568b5a98de7bb73727b02202ff77b2635cfb3e7b
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -52,4 -60,6 +60,7 @@@ Rules-quo
  *.csv
  tests/grid
  tests/grid_tree
- build/
++build/
+ test-driver
+ *.gir
 -*.typelib
++*.typelib