Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery
authorChuck Hagenbuch <chuck@horde.org>
Fri, 20 Nov 2009 14:58:58 +0000 (09:58 -0500)
committerChuck Hagenbuch <chuck@horde.org>
Fri, 20 Nov 2009 14:58:58 +0000 (09:58 -0500)

Trivial merge