[MERGE] InterTree.compare doesn't pass require_versioned on correctly

[Ian Clatworthy]

Ian Clatworthy has voted approve.
Status is now: Semi-approved
Comment:
John had previously approved this before Robert's suggestion to simplify 
the test was incorporated. I approve it as well but please remember to 
update NEWS in future patches.

I'll merge it and add the NEWS item.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C418c22640707311327m5a8bfe47yc79dd9c89fee9a3c%40mail.gmail.com%3E