This will fix the bad head by Tim?
author <brian@gir> <>
Sun, 20 Apr 2008 22:53:48 +0000 (15:53 -0700)
committer <brian@gir> <>
Sun, 20 Apr 2008 22:53:48 +0000 (15:53 -0700)

Trivial merge