Merge commit 'diablo-package-3.3b1-1' into fremantle-package

diff --cc config-ui/browser-switchboard-cp.c
index c34778b,0c768e1..b11fd2c
--- 1/config-ui/browser-switchboard-cp.c
--- 2/config-ui/browser-switchboard-cp.c
+++ b/config-ui/browser-switchboard-cp.c
@@@ -64,9 -64,10 +64,9 @@@ struct browser_entry 
        char *displayname;
  };
  struct browser_entry browsers[] = {
-       { "microb", "MicroB" }, /* First entry is the default! */
+       { "microb", "MicroB (stock browser)" }, /* First entry is the default! */
        { "tear", "Tear" },
        { "fennec", "Mobile Firefox (Fennec)" },
 -      { "opera", "Opera Mobile" },
        { "midori", "Midori" },
        { "other", "Other" },
        { NULL, NULL },

diff --cc debian/changelog
index c9e8ca7,ebc1ebf..28645e3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,22 +1,31 @@@
+ browser-switchboard (3.3~b1-1) extras-devel; urgency=low
+ 
+   * New "upstream" development release.
+   * Upstream changes:
+     - add support for Opera Mobile
+     - fall back to the built-in default if the user's configured default
+       browser isn't installed
+     - introduce a command-line config utility; this is mainly intended to give
+       browser vendors a way to set their browser as the default
+     - provide a description for users who don't know what MicroB is; thanks
+       Emanuele Cassioli for pointing out the need
+     - major rewrite of configuration loading/saving code
+   * Cherry-pick addb0ed9... ("Add command-line utility to Makefile install
+     target").
+   * Packaging changes:
+     - Build and install the new command-line config utility.
+ 
+  -- Steven Luo <steven+maemo@steven676.net>  Sun, 30 May 2010 02:52:31 -0700 
+ 
 +browser-switchboard (3.2-2fremantle1) extras-devel; urgency=low
 +
 +  * Beta release for Fremantle.
 +  * Packaging changes:
 +    - Clear hildon-control-panel's cached screenshot on package remove.
 +    - Don't build with -mthumb, to avoid a SIGILL on PR1.2.
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Fri, 28 May 2010 01:40:27 -0700 
 +
  browser-switchboard (3.2-2) extras-devel; urgency=low
  
    * Cherry-pick ebfd6218... ("Add preliminary support for Opera Mobile").

diff --cc debian/rules
index 358cfd6,60f0ec8..4eb9973
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -27,8 -28,8 +27,8 @@@ build: build-stam
  build-stamp: configure-stamp 
        dh_testdir
  
 -      make EXTRA_CFLAGS="$(EXTRA_CFLAGS)" diablo
 -      make -C config-ui EXTRA_CFLAGS="$(EXTRA_CFLAGS)" diablo-plugin util
 +      make EXTRA_CFLAGS="$(EXTRA_CFLAGS)" fremantle
-       make -C config-ui EXTRA_CFLAGS="$(EXTRA_CFLAGS)" fremantle-plugin
++      make -C config-ui EXTRA_CFLAGS="$(EXTRA_CFLAGS)" fremantle-plugin util
  
        touch $@