Merge from trunk.
authorPadraig O'Sullivan <osullivan.padraig@gmail.com>
Fri, 2 Oct 2009 23:08:54 +0000 (19:08 -0400)
committerPadraig O'Sullivan <osullivan.padraig@gmail.com>
Fri, 2 Oct 2009 23:08:54 +0000 (19:08 -0400)

Trivial merge