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)
commit24353992d6086a53123cc6a42fd41b982acb0952
tree12d7422386e7fb605067001915c980979463dc1e
parent8cc3921d72dabcc2a89c38bbee08007b7abe6976
parentd20cee857309bed42aaacf8486c440349a579a3c
Merge from trunk.