merged rel20 branch (up to r3682) back into trunk
added regression to test 139 for #1427
linted

git-svn-id: http://sphinxsearch.googlecode.com/svn/trunk@3684 8b96e2b9-35c5-2c16-bc47-5122d61876d4