merge of branch release-3.0rc1 r7560-7639 to trunk
Authored by: pangloss 2008-07-29
Parent: [r7639]
Child: [r7641]