Fri, 16 Oct 2009 17:22:19 +0200 merge