Deleting branch dev-148932, merged to trunk
Authored by: bbranan 2008-06-05
Parent: [r7252]
Child: [r7254]