Merged with be.wtk trunk
authorW. Trevor King <wking@drexel.edu>
Thu, 28 Jan 2010 16:00:27 +0000 (11:00 -0500)
committerW. Trevor King <wking@drexel.edu>
Thu, 28 Jan 2010 16:00:27 +0000 (11:00 -0500)

Trivial merge