Chris Larsen - 2010-05-14

Added/Fixed in CVS tree. Will be available in next version.