Merge branch 'master' into dev
Authored by: Rick Copeland 2010-12-08
Parent(s): [1d84c0][7a16b0]
Child(ren): [60454a]