Conflicts:
kaminari.gemspec
lib/kaminari/models/data_mapper_extension.rb
lib/kaminari/railtie.rb
spec/models/data_mapper_spec.rb
also, refactored a lot to make the code simple
Prevent problems when using running tests with
a mongoid.yml using YAML merge keys on Ruby 1.9.2
and RubyGems >= 1.5
Will be needed until r30629 and r30630 are backported
to 1.9.2 (ticket #4357)
http://redmine.ruby-lang.org/issues/show/4357