Merge branch 'master' of dev.horde.org:/horde/git/horde-hatchery
authorMichael M Slusarz <slusarz@curecanti.org>
Mon, 10 Nov 2008 17:58:31 +0000 (10:58 -0700)
committerMichael M Slusarz <slusarz@curecanti.org>
Mon, 10 Nov 2008 17:58:31 +0000 (10:58 -0700)

Trivial merge