third line of haiku
Merge branch 'master' of github.com:etmoore/gdi-haiku