merge Justin's changes
commita84e0ca9f3f608b6bd53981b80b464655417b233
authorSean O'Rourke <seano@foobar.local>
Thu, 7 Oct 2010 13:15:25 +0000 (7 06:15 -0700)
committerSean O'Rourke <seano@foobar.local>
Thu, 7 Oct 2010 13:15:25 +0000 (7 06:15 -0700)
treeac3eadbebdf537f5338ce3edd1c5e45280f2d23f
parent245febca616aa330ae092aa5310d28bc448c8517
parent1eb7c6c4521f21654e258717386477a62755fad3
merge Justin's changes