Merge pull request #1030 from eileenmcnaughton/master
authorTim Otten <to-git@think.hm>
Wed, 19 Jun 2013 14:27:02 +0000 (07:27 -0700)
committerTim Otten <to-git@think.hm>
Wed, 19 Jun 2013 14:27:02 +0000 (07:27 -0700)
fix api return bug highlighted by syntaxconformancetest


Trivial merge