0.11-stable: Fix #7232 with documentation and fix the id collision problem found in the process.
Authored by: ecarter 2008-05-17
Parent: [r7085]
Child: [r7087]