sync with wheezy/updates
Merge pull request #6 from proppy/master

sync with wheezy/updates