Merge 'trunk' into 'fix_request_uri'
Tomas Doran [Sun, 2 May 2010 23:46:42 +0000 (23:46 +0000)]
r15492@tomas-dorans-macbook-pro (orig r13196):  rafl | 2010-05-02 23:44:30 +0000
Unbreak tests by actually adding the module they're supposed to test.


Trivial merge