Merge commit 'refs/merge-requests/17' of git@gitorious.org:meego-sharing-framework... v0.3.18.2
authordivya <divya.subramanian@sasken.com>
Thu, 5 May 2011 11:01:06 +0000 (16:31 +0530)
committerdivya <divya.subramanian@sasken.com>
Thu, 5 May 2011 11:01:06 +0000 (16:31 +0530)
commit743df4342fd14af392908398458f3c69e19c43b6
tree06e82697cbe860bd3a848d738083917dcd792024
parent109be52319f25de0520c2f04e828378a139341da
parentae24a3f091823921059ca934e581184783550664
Merge commit 'refs/merge-requests/17' of git@gitorious.org:meego-sharing-framework/webupload-engine into merge-requests/16

Conflicts:

debian/changelog
debian/changelog