merge from branches/QParserGenerator_Release_1_0

git-svn-id: https://qlanguage.googlecode.com/svn/trunk@253 6d982bb3-a5a7-393d-ffc5-582415be9c85