Merge branch 'mgiuca-wx-config' into integration
authortcatm <tcatm@gawab.com>
Fri, 25 Feb 2011 23:59:55 +0000 (00:59 +0100)
committertcatm <tcatm@gawab.com>
Fri, 25 Feb 2011 23:59:55 +0000 (00:59 +0100)

Trivial merge