Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery
authorChuck Hagenbuch <chuck@horde.org>
Sat, 15 Nov 2008 17:24:38 +0000 (12:24 -0500)
committerChuck Hagenbuch <chuck@horde.org>
Sat, 15 Nov 2008 17:24:38 +0000 (12:24 -0500)

Trivial merge