Merged trunk into pheonixstorm branch. Once next two diffs complete and a successful compile I will merge my brank into trunk and update data.
Authored by: pheonixstorm 2010-12-14
Parent: [r12973]
Child: [r12975]