exported from svn
Merge branch 'master' of https://github.com/honnel/InstantSoup