Merge branch 'master' of git://github.com/ry/node
authorUrban Hafner <urban@bettong.net>
Tue, 16 Jun 2009 19:09:37 +0000 (21:09 +0200)
committerUrban Hafner <urban@bettong.net>
Tue, 16 Jun 2009 19:09:37 +0000 (21:09 +0200)

Trivial merge