Thu, 16 Jun 2011 11:05:13 +0100 Mario de Sousa Merging two previous commits.