* wxsmith_branch: merged with trunk (trunk to wxsmith_branch)
Authored by: mortenmacfly 2011-10-09
Parent: [r7487]
Child: [r7489]