Moved comment outside of the javadoc.
Makes sure text output is returned to documentation
Merge pull request #428 from systay/1.9-maint

Makes sure text output is returned from queries to documentation
scala 2.10 support: Kills type erasure warnings with a few casts and cleans up a bit
Merge pull request #433 from boggle/scala_2_10_warnings

scala 2.10 support: Kills type erasure warnings with a few casts and cle...
Forward port of the 1.8.1 parser
Merge branch '1.9-maint'