Merge branch 'treechanges'
authormelinath <stephen.r.burrows@gmail.com>
Thu, 10 Jun 2010 22:03:49 +0000 (18:03 -0400)
committermelinath <stephen.r.burrows@gmail.com>
Thu, 10 Jun 2010 22:03:49 +0000 (18:03 -0400)

Trivial merge