Merge commit 'diablo-package-3.0rc1-2' into fremantle-package
authorSteven Luo <steven+maemo@steven676.net>
Sat, 19 Dec 2009 04:42:34 +0000 (20:42 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Sat, 19 Dec 2009 04:42:34 +0000 (20:42 -0800)
commitc3f942f547f89bd38b9e50ca18e745dca614b589
treeb2f11048a18955b9c8ebb32ce4080a3f7fe18f8f
parent6ddcb2a47054dd41fca725308c42908adff142c2
parent8d6c93d62366432a70aba8a2d33a26be2a13324c
Merge commit 'diablo-package-3.0rc1-2' into fremantle-package

Conflicts:

debian/changelog
debian/changelog