This commit was manufactured as part of Drupal's Great Git Migration to

create branch 'DRUPAL-6--3'.

Cherrypick from master 2010-05-19 18:28:09 UTC Derek Wright <git@dwwright.net> '#487790 by dww: Added initial integration between location and panels/ctools.':
    plugins/contexts/location.inc
    plugins/relationships/location_from_node.inc