Merge lp://staging/~jjed/app-install-data-ubuntu/oneiric-b1 into lp://staging/app-install-data-ubuntu

menu-data/aisleriot:freecell.desktop (+18/-0)
menu-data/aisleriot:sol.desktop (+3/-3)
menu-data/alacarte:alacarte.desktop (+1/-1)
menu-data/anjuta:anjuta.desktop (+1/-1)
menu-data/arkose-gui:arkose-gui.desktop (+1/-1)
menu-data/assogiate:assogiate.desktop (+3/-1)
menu-data/banshee:banshee.desktop (+1/-1)
menu-data/basket:kde4__basket.desktop (+0/-1)
menu-data/cairo-dock-core:cairo-dock.desktop (+1/-1)
menu-data/cheese:cheese.desktop (+1/-1)
menu-data/chromium-browser:chromium-browser.desktop (+10/-1)
menu-data/computer-janitor-gtk:computer-janitor-gtk.desktop (+1/-1)
menu-data/dconf-tools:dconf-editor.desktop (+1/-2)
menu-data/deja-dup:deja-dup-ccpanel.desktop (+11/-2)
menu-data/deja-dup:deja-dup.desktop (+3/-1)
menu-data/deluge-gtk:deluge.desktop (+51/-1)
menu-data/desktop-webmail:desktop-webmail.desktop (+1/-1)
menu-data/desktopcouch-tools:desktopcouch-pair.desktop (+1/-0)
menu-data/eiciel:eiciel.desktop (+1/-1)
menu-data/empathy:empathy.desktop (+1/-1)
menu-data/eog:eog.desktop (+1/-1)
menu-data/evolution:evolution.desktop (+1/-1)
menu-data/f-spot:f-spot.desktop (+0/-1)
menu-data/file-roller:file-roller.desktop (+1/-1)
menu-data/firefox:firefox.desktop (+1/-1)
menu-data/fltk1.3-games:flblocks.desktop (+13/-0)
menu-data/fltk1.3-games:flcheckers.desktop (+13/-0)
menu-data/fltk1.3-games:flsudoku.desktop (+13/-0)
menu-data/fluid:fluid.desktop (+1/-1)
menu-data/gcompris:gcompris.desktop (+13/-4)
menu-data/gconf-editor:gconf-editor.desktop (+1/-1)
menu-data/gdebi:gdebi.desktop (+1/-1)
menu-data/gedit:gedit.desktop (+1/-12)
menu-data/glchess:glchess.desktop (+1/-1)
menu-data/glines:glines.desktop (+1/-1)
menu-data/gnect:gnect.desktop (+1/-1)
menu-data/gnibbles:gnibbles.desktop (+1/-1)
menu-data/gnobots2:gnobots2.desktop (+1/-1)
menu-data/gnome-bluetooth:bluetooth-properties.desktop (+1/-1)
menu-data/gnome-bluetooth:bluetooth-sendto.desktop (+1/-1)
menu-data/gnome-bluetooth:bluetooth-wizard.desktop (+1/-1)
menu-data/gnome-color-manager:gcm-calibrate.desktop (+18/-0)
menu-data/gnome-color-manager:gcm-import.desktop (+2/-94)
menu-data/gnome-color-manager:gcm-picker.desktop (+18/-0)
menu-data/gnome-color-manager:gcm-viewer.desktop (+18/-0)
menu-data/gnome-commander-data:gnome-commander.desktop (+1/-1)
menu-data/gnome-contacts:gnome-contacts.desktop (+14/-0)
menu-data/gnome-disk-utility:palimpsest.desktop (+1/-122)
menu-data/gnome-keyring:gnome-keyring-prompt.desktop (+1/-71)
menu-data/gnome-mahjongg:mahjongg.desktop (+1/-1)
menu-data/gnome-menus:gmenu-simple-editor.desktop (+0/-113)
menu-data/gnome-shell:gnome-shell.desktop (+1/-1)
menu-data/gnome-sudoku:gnome-sudoku.desktop (+1/-1)
menu-data/gnome-tweak-tool:gnome-tweak-tool.desktop (+3/-2)
menu-data/gnomine:gnomine.desktop (+1/-1)
menu-data/gnotravex:gnotravex.desktop (+1/-1)
menu-data/gnotski:gnotski.desktop (+1/-1)
menu-data/gnumeric-common:gnumeric.desktop (+0/-1)
menu-data/gparted:gparted.desktop (+1/-1)
menu-data/gresistor:gresistor.desktop (+2/-0)
menu-data/gtali:gtali.desktop (+1/-1)
menu-data/gtg:gtg.desktop (+0/-1)
menu-data/gtkpod:gtkpod.desktop (+8/-13)
menu-data/gwget:gwget.desktop (+0/-21)
menu-data/gxtuner:gxtuner.desktop (+14/-0)
menu-data/hamfax:hamfax.desktop (+13/-0)
menu-data/hedgewars:hedgewars.desktop (+0/-1)
menu-data/hijra-applet:hijra-applet.desktop (+1/-1)
menu-data/hornsey:hornsey.desktop (+0/-19)
menu-data/iagno:iagno.desktop (+1/-1)
menu-data/ibus:ibus.desktop (+19/-0)
menu-data/indicator-multiload:indicator-multiload.desktop (+8/-20)
menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop (+1/-1)
menu-data/kdelibs-data:kde__kresources.desktop (+0/-214)
menu-data/kgraphviewer:kde4__kgrapheditor.desktop (+14/-3)
menu-data/kgraphviewer:kde4__kgraphviewer.desktop (+13/-2)
menu-data/kimagemapeditor-kde3:kde__kimagemapeditor.desktop (+0/-59)
menu-data/kino:Kino.desktop (+0/-1)
menu-data/kleopatra:kde4__kleopatra.desktop (+1/-1)
menu-data/kleopatra:kde4__kleopatra_import.desktop (+1/-1)
menu-data/klinkstatus-kde3:kde__klinkstatus.desktop (+0/-58)
menu-data/kmail-mobile:kde4__kmail-mobile.desktop (+1/-1)
menu-data/knotes-mobile:kde4__notes-mobile.desktop (+1/-1)
menu-data/kobby:kde4__kobby.desktop (+0/-12)
menu-data/kommander-kde3:kde__kmdr-editor.desktop (+0/-133)
menu-data/korganizer-mobile:kde4__korganizer-mobile.desktop (+1/-1)
menu-data/krb5-auth-dialog:gnome-ka-panel.desktop (+47/-0)
menu-data/krb5-auth-dialog:krb5-auth-dialog-preferences.desktop (+0/-18)
menu-data/krb5-auth-dialog:krb5-auth-dialog.desktop (+35/-0)
menu-data/krusader:kde4__krusader.desktop (+4/-0)
menu-data/kvkbd:kde4__kvkbd.desktop (+29/-1)
menu-data/kwrite:kde4__kwrite.desktop (+1/-1)
menu-data/kxsldbg-kde3:kde__kxsldbg.desktop (+0/-57)
menu-data/language-selector-gnome:language-selector.desktop (+4/-2)
menu-data/libfm-gtk-data:libfm-pref-apps.desktop (+52/-0)
menu-data/libreoffice-base:libreoffice-base.desktop (+2/-2)
menu-data/libreoffice-calc:libreoffice-calc.desktop (+3/-3)
menu-data/libreoffice-common:libreoffice-startcenter.desktop (+3/-2)
menu-data/libreoffice-draw:libreoffice-draw.desktop (+3/-3)
menu-data/libreoffice-impress:libreoffice-impress.desktop (+3/-3)
menu-data/libreoffice-math:libreoffice-math.desktop (+3/-3)
menu-data/libreoffice-writer:libreoffice-writer.desktop (+6/-3)
menu-data/lightspark:lightspark.desktop (+15/-0)
menu-data/ltsp-livecd:ltsp-live.desktop (+11/-0)
menu-data/lxinput:lxinput.desktop (+8/-2)
menu-data/meld:meld.desktop (+2/-1)
menu-data/midori:midori.desktop (+14/-4)
menu-data/mono-runtime:mono-runtime-terminal.desktop (+12/-0)
menu-data/mono-runtime:mono-runtime.desktop (+12/-0)
menu-data/openbox:openbox.desktop (+0/-11)
menu-data/othman:Othman.desktop (+2/-0)
menu-data/parcellite:parcellite.desktop (+3/-2)
menu-data/pcmanfm:pcmanfm.desktop (+26/-3)
menu-data/pgdesigner:pgdesigner.desktop (+0/-13)
menu-data/pidgin:pidgin.desktop (+0/-1)
menu-data/pino:pino.desktop (+20/-0)
menu-data/pitivi:pitivi.desktop (+1/-1)
menu-data/qt4-qtconfig:qtconfig-qt4.desktop (+1/-1)
menu-data/quadrapassel:quadrapassel.desktop (+2/-2)
menu-data/quanta:kde__quanta.desktop (+0/-99)
menu-data/rawtherapee:rawtherapee.desktop (+14/-6)
menu-data/sakura:sakura.desktop (+1/-1)
menu-data/scribus:scribus.desktop (+62/-16)
menu-data/sineshaper:sineshaper.desktop (+14/-0)
menu-data/smplayer:smplayer.desktop (+1/-1)
menu-data/software-center:ubuntu-software-center.desktop (+1/-1)
menu-data/specimen:specimen.desktop (+2/-3)
menu-data/synaptic:synaptic.desktop (+2/-2)
menu-data/tasks-mobile:kde4__tasks-mobile.desktop (+1/-1)
menu-data/thunderbird:thunderbird.desktop (+2/-2)
menu-data/touchegg:touchegg.desktop (+14/-0)
menu-data/transmission-gtk:transmission-gtk.desktop (+7/-3)
menu-data/transmission-qt:transmission-qt.desktop (+1/-1)
menu-data/triplane:triplane.desktop (+13/-0)
menu-data/twitux:twitux.desktop (+0/-20)
menu-data/vinagre:vinagre.desktop (+1/-1)
menu-data/vino:vino-preferences.desktop (+1/-1)
menu-data/virt-manager:virt-manager.desktop (+1/-1)
menu-data/virtaal:virtaal.desktop (+43/-10)
menu-data/yelp:yelp.desktop (+3/-3)
menu-data/zanshin:kde4__zanshin.desktop (+0/-1)