Merge remote branch 'origin/fruitiex/branding_lagclock'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:41:26 +0000 (21:41 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:41:26 +0000 (21:41 +0100)

Trivial merge