Merged in the successful per-tree-config branch.
authorW. Trevor King <wking@drexel.edu>
Thu, 4 Dec 2008 17:42:22 +0000 (12:42 -0500)
committerW. Trevor King <wking@drexel.edu>
Thu, 4 Dec 2008 17:42:22 +0000 (12:42 -0500)

Trivial merge