lfoxton
committed
on 28 Oct 09
LDEV-2440 Merging with head