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)
commit34418e51585216006d5b241fc9104dc4b88d1be0
tree860d5bfaac0da486870e43ff588a5048e2f670b9
parente1a4e5405f227e58347d775022dd38fa2595b20b
parentb30880274b5b866db3780148eaf9bf36e09bb1fb
Merge from trunk.