Merge heads
authorKurt B. Kaiser <kbk@shore.net>
Sat, 14 May 2011 21:31:54 +0000 (17:31 -0400)
committerKurt B. Kaiser <kbk@shore.net>
Sat, 14 May 2011 21:31:54 +0000 (17:31 -0400)

Trivial merge