merged deprototype branch to trunk
Dave Rolsky [Fri, 26 Sep 2008 19:40:04 +0000 (19:40 +0000)]

Trivial merge