Merge branch 'master' of ssh://dev.horde.org/horde/git/horde-hatchery
authorDuck (Jakob Munih) <duck@obala.net>
Thu, 29 Jan 2009 23:49:11 +0000 (00:49 +0100)
committerDuck (Jakob Munih) <duck@obala.net>
Thu, 29 Jan 2009 23:49:11 +0000 (00:49 +0100)

Trivial merge