Merge branch 'master' of git@gitorious.org:meego-sharing-framework/transfer-ui
authorRavi Kumar S <ravi.kumars@sasken.com>
Tue, 8 Mar 2011 07:18:45 +0000 (12:48 +0530)
committerRavi Kumar S <ravi.kumars@sasken.com>
Tue, 8 Mar 2011 07:18:45 +0000 (12:48 +0530)
commitc544a06fc67d68848e2480f5053c6c0fd1b564df
treeae69a581bbf38f1cb0d8d467429904f37f953762
parent385eb70b6bc6ecce9fdfea21477bfa0d13a3f51f
parent363e585ad598221ea4e89492dc37343dca88fe52
Merge branch 'master' of git@gitorious.org:meego-sharing-framework/transfer-ui

Conflicts:

debian/changelog