Merge remote branch 'origin/v0.6'
authorRyan Dahl <ry@tinyclouds.org>
Fri, 23 Dec 2011 23:58:11 +0000 (15:58 -0800)
committerRyan Dahl <ry@tinyclouds.org>
Fri, 23 Dec 2011 23:58:11 +0000 (15:58 -0800)
commitc2d9e62f1691ace1c837811716aa515d5c4947fc
treea6cf3eb1e2bbb3ef1d5db3916af55341537f9637
parente4731f816817bc6ea52d1fa2d51cb024bd48c337
parentd85c85aac1e2e87c0dbac7feddeb38f23da6d700
Merge remote branch 'origin/v0.6'

Conflicts:
deps/v8/src/version.cc