Commit 564f0f7be1d962fdb3bdc42e7e47db9c1ce960ec

Vicent Martí 2011-09-02T06:08:47

Merge pull request #388 from lambourg/master pull request for #387