Merge branch 'non-std-time-signature'
authorStefan Westerfeld <stefan@space.twc.de>
Mon, 16 May 2011 14:33:21 +0000 (16:33 +0200)
committerStefan Westerfeld <stefan@space.twc.de>
Mon, 16 May 2011 14:33:21 +0000 (16:33 +0200)

Trivial merge