new rules on branch merges

[Phil Edwards]

> From now on, please check into branch at the same time as trunk. No
> more week-old merges.

I'll be doing some doxygen-related checkins shortly (assuming I don't get
bitten by another doxygen bug) on trunk and branch, followed by the usual
mass copy of docs from trunk to both 3.0 and 3.1 branches (I forgot to do
so for 3.0.4).

I really oughta write that down somewhere...


Phil

-- 
If ye love wealth greater than liberty, the tranquility of servitude greater
than the animating contest for freedom, go home and leave us in peace.  We seek
not your counsel, nor your arms.  Crouch down and lick the hand that feeds you;
and may posterity forget that ye were our countrymen.            - Samuel Adams