[Merge] lp:~mathieu-tl/ubuntu/maverick/hildon-desktop/lp647628 into lp:ubuntu/hildon-desktop

[Mathieu Trudel]

Mathieu Trudel has proposed merging lp:~mathieu-tl/ubuntu/maverick/hildon-desktop/lp647628 into lp:ubuntu/hildon-desktop.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  #647628 package hildon-desktop 1:2.0.11-1~svn15367-0ubuntu7 failed to install/upgrade: trying to overwrite '/etc/xdg/menus/applications.menu', which is also in package gnome-menus 2.30.3-0ubuntu2
  https://bugs.launchpad.net/bugs/647628

-- 
https://code.launchpad.net/~mathieu-tl/ubuntu/maverick/hildon-desktop/lp647628/+merge/37070
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~mathieu-tl/ubuntu/maverick/hildon-desktop/lp647628 into lp:ubuntu/hildon-desktop.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 2932 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20100929/6968c3b8/attachment.diff