Merge branch 'pylons'
authorJan Dittberner <jan@dittberner.info>
Wed, 21 Jan 2009 00:39:14 +0000 (01:39 +0100)
committerJan Dittberner <jan@dittberner.info>
Wed, 21 Jan 2009 00:39:14 +0000 (01:39 +0100)

Trivial merge