Merge branch 'edge' into track_allocs
authorAdam Green <adamgr@foo.bar>
Wed, 13 Feb 2013 01:43:39 +0000 (17:43 -0800)
committerAdam Green <adamgr@foo.bar>
Wed, 13 Feb 2013 01:43:39 +0000 (17:43 -0800)

Trivial merge