Merge from trunk.
authorPadraig O'Sullivan <osullivan.padraig@gmail.com>
Wed, 7 Oct 2009 01:18:36 +0000 (21:18 -0400)
committerPadraig O'Sullivan <osullivan.padraig@gmail.com>
Wed, 7 Oct 2009 01:18:36 +0000 (21:18 -0400)

Trivial merge