Merge trunk.
authorPadraig O'Sullivan <osullivan.padraig@gmail.com>
Sat, 11 Jul 2009 19:11:57 +0000 (15:11 -0400)
committerPadraig O'Sullivan <osullivan.padraig@gmail.com>
Sat, 11 Jul 2009 19:11:57 +0000 (15:11 -0400)

Trivial merge