Merge branch 'master' of ssh://dev.horde.org/horde/git/horde
authorBen Klang <ben@alkaloid.net>
Mon, 6 Apr 2009 03:48:00 +0000 (23:48 -0400)
committerBen Klang <ben@alkaloid.net>
Mon, 6 Apr 2009 03:48:00 +0000 (23:48 -0400)

Trivial merge