It looks like this needs a rebase and at a quick glance it looks likemore than a trivial conflict. I'll mark it Waiting on Author. Pleaseupdate it back when it's rebased
--Gregory StarkAs Commitfest Manager