Wiki Blame: Merged through [6715] from trunk
Authored by: thatch 2008-03-19
Parent: [r6715]
Child: [r6717]