Merged Gianluca's nested directory fix.
authorW. Trevor King <wking@drexel.edu>
Sat, 24 Oct 2009 11:21:07 +0000 (07:21 -0400)
committerW. Trevor King <wking@drexel.edu>
Sat, 24 Oct 2009 11:21:07 +0000 (07:21 -0400)

Trivial merge