Merge commit 'diablo-package-3.2-1' into test-branch
authorSteven Luo <steven+maemo@steven676.net>
Mon, 22 Feb 2010 10:46:28 +0000 (02:46 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Mon, 22 Feb 2010 10:46:28 +0000 (02:46 -0800)
commit1e3b1303d7f5740a01cc7386014c2984556124cb
tree833b3613b9540d9aefe7d2d16d967fff938fa8d4
parent12160eda7b58b2bc2fe1a91f3bc5e3abaffab398
parentd202661efcc1554a6d41a181185e34b7779b58d3
Merge commit 'diablo-package-3.2-1' into test-branch

Conflicts:

debian/changelog
debian/rules
debian/changelog
debian/rules