Merge updates from en up to r1929.
Property changes only, no text changes.
Authored by: maxb 2006-01-11
Parent: [r1929]
Child: [r1931]