Merge branch 'master' of mrubinsk@dev.horde.org:/horde/git/horde-hatchery
authorMichael J. Rubinsky <mrubinsk@horde.org>
Mon, 24 Nov 2008 19:23:29 +0000 (14:23 -0500)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Mon, 24 Nov 2008 19:23:29 +0000 (14:23 -0500)

Trivial merge