Merge commit 'ashb/master'
Florian Ragwitz [Sat, 23 May 2009 20:54:49 +0000 (22:54 +0200)]
* commit 'ashb/master':
  Failing tests for line number issues


Trivial merge