Merged revision [7238] via svnmerge from 0.11-stable (Inter*-link/label fix).
Authored by: osimons 2008-06-24
Parent: [r7238]
Child: [r7240]