Merge in removal of memaslap docs
authorBrian Aker <brian@tangent.org>
Thu, 7 Apr 2011 22:01:42 +0000 (15:01 -0700)
committerBrian Aker <brian@tangent.org>
Thu, 7 Apr 2011 22:01:42 +0000 (15:01 -0700)

Trivial merge