Merge r7189, r7191, r7192, and r7194 into trunk.
Authored by: cmlenz 2008-06-09
Parent: [r7194]
Child: [r7196]