fix location type to work with nullstorage controller
Merge branch 'master' of git://github.com/flack/openpsa