Merge from pannekake.
authorsgunderson@bigfoot.com <>
Sun, 31 May 2009 19:43:18 +0000 (21:43 +0200)
committersgunderson@bigfoot.com <>
Sun, 31 May 2009 19:43:18 +0000 (21:43 +0200)

Trivial merge