Merge branch 'master' into dev
Authored by: Rick Copeland 2010-12-08
Parent(s): [591c74][e05db9]
Child(ren): [0afdfd]