Merge branch 'master' of git://github.com/flavour/eden
Bug fix.
Simplify count where we know what the rows are.
Merge branch 'master' of git://github.com/nursix/eden