Merge 'trunk' into 'prefetch_pager'
Peter Rabbitson [Sun, 17 Jan 2010 15:46:20 +0000 (15:46 +0000)]
r8337@Thesaurus (orig r8325):  ribasushi | 2010-01-15 17:13:28 +0100
RT52674
r8346@Thesaurus (orig r8334):  ribasushi | 2010-01-17 09:41:49 +0100
No method aliasing in OO code, *ever*


Trivial merge