Merge 'trunk' into 'fix_request_uri'
Tomas Doran [Sat, 15 May 2010 07:54:10 +0000 (07:54 +0000)]
r15535@spaceinvaders (orig r13239):  ribasushi | 2010-05-12 13:48:40 +0200
Better stats API explanation (SpiceMan)


Trivial merge