Merge branch 'lineno'
Lukas Mai [Tue, 9 Aug 2011 10:12:23 +0000 (12:12 +0200)]

Trivial merge