Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery
authorChuck Hagenbuch <chuck@horde.org>
Sat, 21 Nov 2009 01:04:19 +0000 (20:04 -0500)
committerChuck Hagenbuch <chuck@horde.org>
Sat, 21 Nov 2009 01:04:19 +0000 (20:04 -0500)

Trivial merge