Merge branch 'feature/distance'
authorJanne Änäkkälä <janne_anakkala@hotmail.com>
Tue, 27 Apr 2010 10:37:58 +0000 (13:37 +0300)
committerJanne Änäkkälä <janne_anakkala@hotmail.com>
Tue, 27 Apr 2010 10:37:58 +0000 (13:37 +0300)

Trivial merge