r4z0r7o3 - 2006-04-16

Patch to proposed 2.1.1 version