Merge branch 'embed'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 5 Oct 2010 21:49:59 +0000 (17:49 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 5 Oct 2010 21:49:59 +0000 (17:49 -0400)
commitb768cb7ae3b355a09bbf554522584db729d23c14
tree0869b59b6e6db2193fd7433a29bae850f53f5054
parent89ccd16497c79398a27387bf42016e888afec9eb
parent77491cf6fbc97ab4b37c550a42dc673d55f044fa
Merge branch 'embed'