Merge branch 'diablo-package' into fremantle-package fremantle-package-3.2-2fremantle1
authorSteven Luo <steven+maemo@steven676.net>
Fri, 28 May 2010 09:19:04 +0000 (02:19 -0700)
committerSteven Luo <steven+maemo@steven676.net>
Fri, 28 May 2010 09:19:04 +0000 (02:19 -0700)
1  2 
debian/control

diff --cc debian/control
Simple merge