Merge remote branch 'origin/morphed/containers'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 29 Sep 2010 08:48:02 +0000 (10:48 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 29 Sep 2010 08:48:02 +0000 (10:48 +0200)

Trivial merge