Merge branch 'master' into dev
Authored by: Rick Copeland 2010-08-11
Parent(s): [65b74c][91f781]
Child(ren): [6b0bd0]