automatically updated dependencies
Merge branch 'refs/heads/master' into update-dependencies-2013-05-22
Merge pull request #17 from theodi/update-dependencies-2013-05-22

automatically updated dependencies