Merge branch 'master' of gitorious.org:meego-garage/garage-client-services
authorMateu Batle <mateu.batle@collabora.co.uk>
Fri, 30 Apr 2010 16:01:02 +0000 (11:01 -0500)
committerMateu Batle <mateu.batle@collabora.co.uk>
Fri, 30 Apr 2010 16:01:02 +0000 (11:01 -0500)
commite8cf5fdad34351491be8f91c5bbd0f0f2abd4bb7
tree622ee5ca3a070659eb23d165fc8131c887a6beec
parent6f5399686a308c0a5b2b7c875b837b624b656ffc
parentd475a4c7d5a94a9a30c8751cbd7967cb94c9080f
Merge branch 'master' of gitorious.org:meego-garage/garage-client-services