Merge branch 'diablo-package' into test-branch
authorSteven Luo <steven+maemo@steven676.net>
Fri, 27 Aug 2010 07:43:19 +0000 (00:43 -0700)
committerSteven Luo <steven+maemo@steven676.net>
Fri, 27 Aug 2010 07:43:19 +0000 (00:43 -0700)
1  2 
debian/control

diff --cc debian/control
Simple merge