Merged latest updates from trunk and updated documentation.
Authored by: glynos 2008-08-31
Parent: [r75]
Child: [r77]