Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/eden
Importer: don't try to validate deleted records, just find them.
Update OpenLayers to current trunk (although not Google v3 as that still
has issues in our config)
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of git://github.com/flavour/eden