Merge branch 'master' of gitorious.org:meego-os-base/uxlaunch
authorAuke Kok <auke-jan.h.kok@intel.com>
Tue, 31 May 2011 17:51:41 +0000 (10:51 -0700)
committerAuke Kok <auke-jan.h.kok@intel.com>
Tue, 31 May 2011 17:51:41 +0000 (10:51 -0700)
commitf931673173956e0cfd26b24c4a7f255f1da8a7fe
tree860d7e9919e9f1e489b6f83b3daef700b1a800a0
parent95eed03d3c24694d6cfd8513751e262e305f79ef
parent130d6efed0e110c9a9941b660624ece12dc558da
Merge branch 'master' of gitorious.org:meego-os-base/uxlaunch
desktop.c