Merge branch 'master' of mrubinsk@dev.horde.org:/horde/git/horde-hatchery
authorMichael J. Rubinsky <mrubinsk@horde.org>
Tue, 25 Nov 2008 23:43:03 +0000 (18:43 -0500)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Tue, 25 Nov 2008 23:43:03 +0000 (18:43 -0500)

Trivial merge