* Try to fix Mantis 0001054 (http://bugtracker.openmediavault.org/view.php?id=1054)
* Various code improvements

git-svn-id: http://svn.code.sf.net/p/openmediavault/code/trunk@1287 3c3d7b80-5828-415e-9f61-280b98178fff