Merge branch 'hotfix_myinfo' master 1.0
wreis [Mon, 13 Jun 2011 18:36:42 +0000 (15:36 -0300)]

Trivial merge