Merge remote branch 'refs/remotes/origin/mookow/facility114fix'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 9 Aug 2010 04:49:09 +0000 (06:49 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 9 Aug 2010 04:49:09 +0000 (06:49 +0200)

Trivial merge