Merge remote branch 'horde/master' into horde-upstream
authorJan Schneider <jan@horde.org>
Tue, 9 Nov 2010 17:10:30 +0000 (18:10 +0100)
committerJan Schneider <jan@horde.org>
Tue, 9 Nov 2010 17:10:30 +0000 (18:10 +0100)

Trivial merge