Merge branch 'master' of git://git.openpandora.org/openpandora.oe

Conflicts:
	recipes/tasks/task-pandora-xfce.bb

diff --combined recipes/tasks/task-pandora-xfce.bb
index e2e0f69,ff27287..ac10305
--- 1/recipes/tasks/task-pandora-xfce.bb
--- 2/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@@ -2,7 -2,7 +2,7 @@@ DESCRIPTION = "Task file for the XFCE P
  
  # Don't forget to bump the PR if you change it.
  
 -PR = "r21"
 +PR = "r22"
  
  inherit task
  
@@@ -20,7 -20,7 +20,7 @@@ APPS = " 
  #  synergy \
    vnc x11vnc angstrom-x11vnc-xinit \
    xchat \
 -  xournal \
 +#  xournal \
    arora \
  "
  
@@@ -104,6 -104,7 +104,7 @@@ LAUNCHERS = " 
  PANDORA = " \
    pandora-first-run-wizard hsetroot \
    pandora-scripts \
+   pandora-lcd-state \
    pandora-wallpaper-official pandora-wallpaper-community \
    pandora-xfce-defaults \
    pandora-xmms-defaults xmms \
@@@ -136,6 -137,7 +137,6 @@@ QT_SELECTED = " qt4-x11-free 
  
  QT_SUPPORT = " \
    ${QT_SELECTED} \
 -  qt4-plugin-imageformat-png \
    qt4-plugin-imageformat-jpeg \
    qt4-plugin-imageformat-gif \
  "