Merge branch 'setter-injection'
authorChuck Hagenbuch <chuck@horde.org>
Mon, 26 Apr 2010 00:27:51 +0000 (20:27 -0400)
committerChuck Hagenbuch <chuck@horde.org>
Mon, 26 Apr 2010 00:27:51 +0000 (20:27 -0400)

Trivial merge