Merge branch 'Ansel_Styles'
authorMichael J. Rubinsky <mrubinsk@horde.org>
Sat, 18 Sep 2010 02:18:14 +0000 (22:18 -0400)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Sat, 18 Sep 2010 02:18:14 +0000 (22:18 -0400)

Trivial merge