Merge branch 'bug5566' into csnover-bug5566. Fixes #4386, #5566, #6997.
authorColin Snover <github.com@zetafleet.com>
Sun, 12 Dec 2010 08:39:06 +0000 (02:39 -0600)
committerColin Snover <github.com@zetafleet.com>
Sun, 12 Dec 2010 08:39:06 +0000 (02:39 -0600)
commit4fae75d575b20d887e4a273c7991c55f8821a62c
tree17246a77233af2c04fea0d1d66e812e9b75a90b3
parent974637d639a06a050e11d87677d1c1c80bed709d
parent7481a3645af63cef1406687190fd62bdfb1bf254
Merge branch 'bug5566' into csnover-bug5566. Fixes #4386, #5566, #6997.

Conflicts:
src/manipulation.js
test/unit/manipulation.js
src/manipulation.js
test/unit/manipulation.js