Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery
authorChuck Hagenbuch <chuck@horde.org>
Wed, 18 Nov 2009 18:00:37 +0000 (13:00 -0500)
committerChuck Hagenbuch <chuck@horde.org>
Wed, 18 Nov 2009 18:00:37 +0000 (13:00 -0500)

Trivial merge