Updated for Go1#61

Open

yanatan16 wants to merge 2 commits intoPhilio:masterfrom

yanatan16:master

Commits on Jun 12, 2012

go fix
yanatan16
committed

Commits on Jun 13, 2012

All test pass. gofmt
yanatan16
committed