Merge from trunk.
authorPadraig O'Sullivan <osullivan.padraig@gmail.com>
Tue, 4 Aug 2009 03:22:07 +0000 (23:22 -0400)
committerPadraig O'Sullivan <osullivan.padraig@gmail.com>
Tue, 4 Aug 2009 03:22:07 +0000 (23:22 -0400)

Trivial merge