merging some changes from jrollins.
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 27 May 2008 01:46:33 +0000 (21:46 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 27 May 2008 01:46:33 +0000 (21:46 -0400)
commit4f321fb2967f009b8b3330c62bfec2fcc5475418
tree3634d4d5b8e4adb29faa8f9bb3593d0fe20b1a5a
parent19b2668dfef84687e052c42638ad7e696d5fa6a6
parent4eba4e7e66fc7febb1e7255a649f6b6ad240d653
merging some changes from jrollins.