Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde
authorChuck Hagenbuch <chuck@horde.org>
Tue, 17 Aug 2010 15:51:57 +0000 (11:51 -0400)
committerChuck Hagenbuch <chuck@horde.org>
Tue, 17 Aug 2010 15:51:57 +0000 (11:51 -0400)

Trivial merge