zd1211-firmware was renamed to firmware-zd1211.
Merge branch 'stable' into devel
Merge branch 'devel' into feature/wheezy