Merge remote-tracking branch 'origin/terencehill/big_close_button_fix'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:44:37 +0000 (14:44 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:44:37 +0000 (14:44 +0200)

Trivial merge