that fijal didn't move py.test.Item|Function to the py.test.collect namespace
at the time. a pypy fix will follow shortly after i merged the dist.
--HG--
branch : trunk
* added some tests for implied and conflicting options
* make all Session objects inherit from the base session
* small cleanups with respect to test setup
* separate tests a bit
--HG--
branch : trunk