Merge branch 'master' of ssh://git.b9.com/home/gitpub/kmrcl v1.104
authorKevin M. Rosenberg <kevin@rosenberg.net>
Mon, 20 Jun 2011 22:03:01 +0000 (16:03 -0600)
committerKevin M. Rosenberg <kevin@rosenberg.net>
Mon, 20 Jun 2011 22:03:01 +0000 (16:03 -0600)

Trivial merge