Merge 'trunk' into 'fix_request_uri'

Merge 'trunk' into 'fix_request_uri'

r15494@tomas-dorans-macbook-pro (orig r13198):  rafl | 2010-05-03 01:51:43 +0100
Remove useless conditional.
r15515@tomas-dorans-macbook-pro (orig r13219):  wreis | 2010-05-06 13:34:10 +0100
make uri_for a bit cleaner
r15516@tomas-dorans-macbook-pro (orig r13220):  wreis | 2010-05-06 14:30:19 +0100
minor fix for Changes file | add me as a contributor
r15517@tomas-dorans-macbook-pro (orig r13221):  rafl | 2010-05-07 22:11:10 +0100
Pass along options to load_class for plugins.
r15518@tomas-dorans-macbook-pro (orig r13222):  rafl | 2010-05-07 22:48:51 +0100
Changelogging.
r15519@tomas-dorans-macbook-pro (orig r13223):  rafl | 2010-05-07 23:06:26 +0100
Version 5.80023.