Merge branch 'master' of ssh://dev.horde.org/horde/git/horde
authorGunnar Wrobel <wrobel@temple.(none)>
Fri, 26 Feb 2010 21:53:30 +0000 (22:53 +0100)
committerGunnar Wrobel <wrobel@temple.(none)>
Fri, 26 Feb 2010 21:53:30 +0000 (22:53 +0100)

Trivial merge