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