wip/electricsheep-svn/patches
