Wed, 16 Dec 2009 14:13:55 +0100 tkragelj Changes merged