Merge branch 'rc/194'
Authored by: Rick Copeland 2010-04-07
Parent(s): [14c74f][ffb098]
Child(ren): [275048]