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

diff --cc debian/changelog
index 68994d4,49c5ccb..a23c791
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,10 +1,23 @@@
+ browser-switchboard (3.3-1) extras-devel; urgency=low
+ 
+   * New "upstream" stable release.
+   * 3.3~b2-1 released as stable with no changes.
+ 
+  -- Steven Luo <steven+maemo@steven676.net>  Thu, 02 Sep 2010 21:44:35 -0700
+ 
 +browser-switchboard (3.3~b2-1fremantle1) extras-devel; urgency=low
 +
 +  * Development release for Fremantle.
 +  * Packaging changes:
 +    - Update debian/rules to build the Fremantle-specific command-line config
 +      tool and install the Xsession.post script.
 +    - Revise the postinst.  Now that we coexist with the MicroB browser
 +      process, don't try to kill it in the postinst; instead, start
 +      browser-switchboard as the user to make sure we handle links from the
 +      get-go, and prestart MicroB if appropriate.
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Sat, 28 Aug 2010 05:19:42 -0700 
 +  
  browser-switchboard (3.3~b2-1) extras-devel; urgency=low
  
    * New "upstream" development release.