New branch 'work/conditionals' available with the following commits:
commit b5b2e3b8d51da001e9d1c51e988eeb9e1e0b5e03
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Thu Feb 17 14:25:24 2011 +0000
work with conditionals