[merge] apply changes for lint fixes, webcal enable
authorxrg@hellug.gr <>
Wed, 11 Aug 2010 08:46:34 +0000 (11:46 +0300)
committerxrg@hellug.gr <>
Wed, 11 Aug 2010 08:46:34 +0000 (11:46 +0300)
bzr revid: xrg@hellug.gr-20100811084634-icdywns9g9kv3pfo


Trivial merge