Merge from trunk.
authorPadraig O'Sullivan <osullivan.padraig@gmail.com>
Tue, 20 Oct 2009 17:23:50 +0000 (13:23 -0400)
committerPadraig O'Sullivan <osullivan.padraig@gmail.com>
Tue, 20 Oct 2009 17:23:50 +0000 (13:23 -0400)

Trivial merge