original patch by Martijn Wargers <m.wargers@hccnet.nl> with some changes by me, r=doron, sr=jst git-svn-id: svn://10.0.0.236/trunk@164283 18797224-902f-48f8-a5cc-f745e15eee43
original patch by Martijn Wargers <m.wargers@hccnet.nl> with some changes by me, r=doron, sr=jst git-svn-id: svn://10.0.0.236/trunk@164283 18797224-902f-48f8-a5cc-f745e15eee43