Merge pull request xwp#41 from jrfnl/Issue-40

Fix variable name collision

bump version to 1.2.1

1.2 final

1.1 final

release version 1.0.1

git-svn-id: http://plugins.svn.wordpress.org/plugin-dependencies/trunk@304104 b8457f37-d9ea-0310-8a92-e5e31aec5664