Merge branch 'master' of ssh://git@gitorious.org/meego-garage/garage-client-services
authorJackie Wu <jackie.wu@intel.com>
Fri, 30 Apr 2010 07:03:00 +0000 (15:03 +0800)
committerJackie Wu <jackie.wu@intel.com>
Fri, 30 Apr 2010 07:03:00 +0000 (15:03 +0800)
commit6f5386c345c4db22c83532495f980f1b6c78962c
treebc15bdc96fde849a6f4790b647bc7292e649079c
parentce3d5bee989844896086fc992e33b70d53871476
parentfacb6f388826dfcc8b11021a05fe812a512ad8dd
Merge branch 'master' of ssh://git@gitorious.org/meego-garage/garage-client-services

Conflicts:
src/applicationmanager.cpp
src/applicationmanager.cpp
src/applicationmanager.h