Merged r3051 from trunk with some changes for 0.8 sessions.
Authored by: edavis10 2009-11-14
Parent: [r3052]
Child: [r3054]