Merge branch 'fixes0.6'
[fapman] / misc /
2010-08-12 Heikki Holstilacleanup
2010-08-11 hqhFirst SVN commit