Merge branch 'master' of ssh://dev.horde.org/horde/git/horde-hatchery
authorMichael J. Rubinsky <mrubinsk@horde.org>
Sat, 14 Feb 2009 23:49:15 +0000 (18:49 -0500)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Sat, 14 Feb 2009 23:49:15 +0000 (18:49 -0500)

Trivial merge