WorkFlow:
* Trunk merges from log:trunk@...:2857
Authored by: athomas 2006-01-31
Parent: [r2857]
Child: [r2859]