Reverted revision 89 to 88, due to very unreadable
diff of changes.
Authored by: hean01 2010-12-15
Parent: [r89]
Child: [r91]