Merge branch 'master' into http-client-adapters
authorMichael J. Rubinsky <mrubinsk@horde.org>
Wed, 19 Aug 2009 18:34:49 +0000 (14:34 -0400)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Wed, 19 Aug 2009 18:34:49 +0000 (14:34 -0400)

Trivial merge