Merge branch 'html' into debian/sid_html

diff --cc .gitignore
index b8ff502c48c5530b84e35099374e1a42c2a5b8b4,b859a1ce664970e7ed180bb0772c1ac49673b954..98c43ecfef7d934dace02ce993fece8f650ab6bc
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -61,7 -61,7 +61,8 @@@ Rules-quo
  tests/grid
  tests/grid_from_xml
  tests/grid_tree
+ tests/grid_html_from_xml
  test-driver
  *.gir
 -*.typelib
 +*.typelib
 +build/