f93f578 Merge branch 'deco2'...

based on: http://github.com/torvalds/subsurface/commit/f93f578eca3a5c8cfed42fa6ddecba63b851e9ae

compiled with: mingw 3.4.5

notes:
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>