Merge from trunk.
authorPadraig O'Sullivan <osullivan.padraig@gmail.com>
Sun, 27 Sep 2009 17:21:58 +0000 (13:21 -0400)
committerPadraig O'Sullivan <osullivan.padraig@gmail.com>
Sun, 27 Sep 2009 17:21:58 +0000 (13:21 -0400)

Trivial merge