Merge branch 'develop' into debian/wheezy

diff --cc .gitignore
index 2ab30bd66210dcd108012698dd7337df0ec5205a,9427155d4e25c8e53deec8a32ba3c87ebe6b8bc1..22db6e98ebd9995029ed34625365ee7e204b30e7
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -62,4 -63,5 +63,6 @@@ Rules-quo
  *.exe
  compile
  gtk-doc.m4
- build/
++build/
+ src/lexycal.yy.[ch]
 -src/rptmarshal.[ch]
++src/rptmarshal.[ch]