Some background: if you've scanned news headlines over the past few weeks, you've probably come across mentions of a spat between China and Japan over some islands in the East China Sea.