merge of '6a31e37aafc15c89be73dccb95d7e0904e6c22c7'

     and 'd9cd8dcb85fb3fc1b2b6b873d5d6d996da16246f'

diff --cc packages/openmoko2/openmoko-today2_svn.bb
index b2af835,7f36405..998d22e
--- 1/packages/openmoko2/openmoko-today2_svn.bb
--- 2/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@@ -1,10 -1,8 +1,8 @@@
  DESCRIPTION = "The OpenMoko Application Launcher"
  SECTION = "openmoko/pim"
- DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
- # for libjana (which should be a seperate bbfile soon)
- DEPENDS += "openmoko-dates2"
 -DEPENDS = "openmoko-dates2 libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
++DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
  RDEPENDS = "libedata-cal openmoko-today2-folders"
  PV = "0.1.0+svnr${SRCREV}"
 -PR = "r1"
 +PR = "r2"
  
  inherit openmoko2 gtk-icon-cache