now that there are multiple ways to link devices, be explicit in RR2 calls
fix RR2 calls
fix typo
Merge pull request #812 from ifreecarve/2013-03-28_explicit_RR2_device_calls

Fix RR2 calls that were broken by the addition of a new device-device association