Merge commit 'diablo-package-3.0rc1-2' into fremantle-package

Conflicts:

	debian/changelog

diff --cc debian/changelog
index 1993fc6,5dc2d45..75ca289
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,21 @@@
+ browser-switchboard (3.0~rc1-2) extras-devel; urgency=low
+ 
+   * Actually upload to extras-devel.
+   * Replace the dependency on libdbus-1-dev and the call to pkg-config for
+     dbus-1 with libosso-dev and libosso, respectively, as that's the package
+     the control panel plugin interface actually needs.  Fixes autobuild.
+ 
+  -- Steven Luo <steven+maemo@steven676.net>  Fri, 18 Dec 2009 19:07:25 -0800
+ 
 +browser-switchboard (3.0~rc1-1fremantle1) extras-devel; urgency=low
 +
 +  * Experimental build for Fremantle.
 +  * Packaging changes:
 +    - Add a different .desktop file with the Fremantle location of the stock
 +      web browser icon.
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Fri, 18 Dec 2009 05:24:16 -0800
 +
  browser-switchboard (3.0~rc1-1) extras-devel; urgency=low
  
    * New "upstream" prerelease.