Merged zitune diskpartition patch + fixed coding style + doc