Merge 'oracle-tweaks' into 'trunk'
Peter Rabbitson [Tue, 12 May 2009 13:12:50 +0000 (15:12 +0200)]

Trivial merge