first commit
Merge branch 'master' of https://github.com/bchapin/wp_oscommerce_plugin
second commit