Code

Merge branch 'quilt'
authorSven Velt <sven@velt.de>
Wed, 26 Jan 2011 11:07:40 +0000 (12:07 +0100)
committerSven Velt <sven@velt.de>
Wed, 26 Jan 2011 11:07:40 +0000 (12:07 +0100)

Trivial merge