Merge of branch dev-149933 (add performance and large datastream tests) to maintenance-2.2
Authored by: bbranan 2008-07-17
Parent: [r7539]
Child: [r7541]