Rails 2.1 eager loading conditions hash bugfix

will.bryant

I've created Rails lighthouse ticket #1101 for a blatant 2.1.x bug breaking :including of associations that have :conditions hashes.

My patch is on the ticket. If you use it, please remember to +1 it so it gets merged.