Merge branch 'TheBlueMatt-setaccountfix' into integration
authortcatm <tcatm@gawab.com>
Sat, 5 Mar 2011 16:26:14 +0000 (17:26 +0100)
committertcatm <tcatm@gawab.com>
Sat, 5 Mar 2011 16:26:14 +0000 (17:26 +0100)

Trivial merge