Merge branch 'horde-upstream'
authorJan <jan@horde.org>
Thu, 4 Nov 2010 21:27:06 +0000 (21:27 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 21:27:06 +0000 (21:27 +0000)

Trivial merge