add commit for history.
Merge branch 'debian/wheezy'