Merge branch 'develop' into debian/wheezy

diff --cc .gitignore
index 71067731652fd50c9c2dfa4f15d6d985de1a823b,cd1690df17d3526f584b62a621d1dab56cc15fa4..2488e9db9cc76eab9c1b4731b5922a0378d1d1ba
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -54,4 -54,5 +54,6 @@@ tests/selec
  tests/getsql
  tests/sqlbuilder
  *~
- build/
+ *.gir
 -*.typelib
++*.typelib
++build/