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

Trivial merge