Merge branch 'master' into dev
Authored by: Rick Copeland 2010-12-27
Parent(s): [0258df][cbb35b]
Child(ren): [92d7b6]