Merge pull request #1 from dotcloud/master

Merge pull request #128 from slon/master