Follow up on http://golang.org/doc/articles/wiki/