Merge branch 'prototype-1.7' of dev.horde.org:/horde/git/horde into prototype-1.7
authorJan Schneider <jan@horde.org>
Wed, 7 Jul 2010 10:41:11 +0000 (12:41 +0200)
committerJan Schneider <jan@horde.org>
Wed, 7 Jul 2010 10:41:11 +0000 (12:41 +0200)

Trivial merge