Merge 'trunk' into 'versioned_enhancements'
Øystein Torget [Tue, 5 Feb 2008 14:42:32 +0000 (14:42 +0000)]
r5826@luke-mbp (orig r4024):  oyse | 2008-02-05 08:42:32 +0000
Added Øystein Torget to the list of contributers


Trivial merge