Merge remote-tracking branch 'origin/terencehill/m_toggle_fix'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 12 Dec 2011 08:33:57 +0000 (09:33 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 12 Dec 2011 08:33:57 +0000 (09:33 +0100)

Trivial merge