* wxsmith_branch: merged with trunk (trunk to wxsmith_branch)
Authored by: mortenmacfly 2012-01-31
Parent: [r7743]
Child: [r7745]