Merge branch 'master' of ssh://git@gitorious.org/meego-garage/garage-client-services
authorJackie Wu <jackie.wu@intel.com>
Sat, 24 Apr 2010 02:17:35 +0000 (10:17 +0800)
committerJackie Wu <jackie.wu@intel.com>
Sat, 24 Apr 2010 02:17:35 +0000 (10:17 +0800)
commitc56b1adde0342e49fdd4be628593236691305e40
treea352c4ec70ab9e9d4baf29552396bd8ec8dc084f
parentaccdedc2e60dc951cbdee296a646b4a62964c889
parentfa2b2d389d1c78d68f0a4fa700f4824ae6478ecf
Merge branch 'master' of ssh://git@gitorious.org/meego-garage/garage-client-services

Conflicts:
src/catalog.cpp
src/catalog.cpp
src/catalog.h