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

Trivial merge