Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde
authorChuck Hagenbuch <chuck@horde.org>
Mon, 30 Mar 2009 03:05:03 +0000 (23:05 -0400)
committerChuck Hagenbuch <chuck@horde.org>
Mon, 30 Mar 2009 03:05:03 +0000 (23:05 -0400)

Trivial merge