Merge commit 'local_master/1.3.5.1@6970' into trunk@12172 trunk@12172
root [Mon, 22 Nov 2010 05:13:37 +0000 (06:13 +0100)]

Trivial merge