Merge branch 'master' of github.com:tla/stemmatology
tla [Tue, 31 May 2011 12:13:54 +0000 (14:13 +0200)]

Trivial merge