Merge branch 'people/riba/find_cleanup' into people/riba/master_cherry
Peter Rabbitson [Sun, 17 Oct 2010 15:47:27 +0000 (17:47 +0200)]

Trivial merge