Merge from trunk.
authorPadraig O'Sullivan <osullivan.padraig@gmail.com>
Thu, 17 Sep 2009 19:14:25 +0000 (15:14 -0400)
committerPadraig O'Sullivan <osullivan.padraig@gmail.com>
Thu, 17 Sep 2009 19:14:25 +0000 (15:14 -0400)

Trivial merge