Merge from trunk.
authorPadraig O'Sullivan <osullivan.padraig@gmail.com>
Wed, 7 Oct 2009 01:18:36 +0000 (21:18 -0400)
committerPadraig O'Sullivan <osullivan.padraig@gmail.com>
Wed, 7 Oct 2009 01:18:36 +0000 (21:18 -0400)
commit8cc3921d72dabcc2a89c38bbee08007b7abe6976
tree75075313269b3354401a44fbae223d68ec0b52d6
parentc26690b35d0a9ed4af02fcd684c7d765f2b306a0
parentbb79693dc3100f28ea4fa477db895876d71fe0e9
Merge from trunk.