Merge remote-tracking branch 'origin/mirceakitsune/screen_update'
authormand1nga <mand1nga@xonotic.org>
Sun, 1 May 2011 23:23:43 +0000 (20:23 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 1 May 2011 23:23:43 +0000 (20:23 -0300)

Trivial merge