Squashed commit of the following:
Squashed commit of the following:

commit 54aeee0496231572768fc3b73b34ea3e50f9ac4e
Author: Peter Donald <peter@realityforge.org>
Date:   Mon Mar 29 22:03:18 2010 +1100

    merging

realityforge/jml,realityforge/jml