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

Trivial merge