Merge branch 'diablo-package' into fremantle-package

diff --combined debian/control
index b12ab0e,a093c93..6fce947
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,23 -2,22 +2,23 @@@ Source: browser-switchboar
  Section: user/network
  Priority: extra
  Maintainer: Steven Luo <steven+maemo@steven676.net>
 -Build-Depends: debhelper (>= 5), libdbus-glib-1-dev, libgtk2.0-dev, libhildon1-dev, libosso-dev, hildon-control-panel-dev
 +Build-Depends: debhelper (>= 5), libdbus-1-dev, libdbus-glib-1-dev, libgtk2.0-dev, libhildon1-dev, libosso-dev, hildon-control-panel-dev
  Standards-Version: 3.8.0
 +XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=1159
  
  Package: browser-switchboard
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}, dbus
 +Depends: ${shlibs:Depends}, ${misc:Depends}, dbus, tablet-browser-ui
  Recommends: tear | fennec | midori
  Provides: browser-proxy
  Conflicts: browser-proxy, fennec-dbus-client
  Description: allows any web browser to be used as the default
   Browser Switchboard is a program which allows you to choose
   which browser to use as the default browser.  It supports
-  MicroB, Tear, Fennec/Mobile Firefox, and Midori out of the box,
-  and can easily be extended to support other browsers.  It can
-  also launch MicroB without having a large background process
-  (browserd) running at all times, saving memory when MicroB 
-  isn't in use.
+  MicroB, Tear, Mobile Firefox, Opera Mobile, and Midori out of
+  the box, and can easily be extended to support other
+  browsers.  It can also launch MicroB without having a large
+  background process (browserd) running at all times, saving
+  memory when MicroB isn't in use.
  XB-Maemo-Display-Name: Browser Switchboard
  Homepage: http://browser-switch.garage.maemo.org/