From: Jerome Dochez <Jerome.Dochez_at_Sun.COM>
Date: Wed, 08 Oct 2008 16:06:06 -0700
In case this was not clear, I want to remind folks that we will *not* do
an automatic merge between the prelude branch and the trunk so each fix
that you checkin in the branch needs to be manually ported to the trunk
if it applies.
For example this is how I just merged a checkin I did in the branch :