These changes should have been part of r16638 - they fix the test suite for the GUI pipe bundle changes.
Authored by: bugman 2012-06-04
Parent: [r16638]
Child: [r16640]