Merge remote branch 'horde/master' into horde-upstream
authorJan <jan@horde.org>
Thu, 4 Nov 2010 21:26:52 +0000 (21:26 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 21:26:52 +0000 (21:26 +0000)

Trivial merge