merging
Merge branch 'lard' of git://github.com/algorithmica/geograph into lard
Merge branch 'lard' of git://github.com/algorithmica/geograph into lard
Merge branch 'lard' of git://github.com/algorithmica/geograph into lard
Merge branch 'lard' of git://github.com/algorithmica/geograph into lard