Merge Mark's fix
author <brian@gir> <>
Sun, 20 Apr 2008 22:51:20 +0000 (15:51 -0700)
committer <brian@gir> <>
Sun, 20 Apr 2008 22:51:20 +0000 (15:51 -0700)

Trivial merge