Merge lp:~ubuntu-branches/ubuntu/natty/xdg-utils/natty-201104080911 into lp:ubuntu/natty/xdg-utils

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/xdg-utils now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/xdg-utils/natty-201104080911. A merge should be performed if necessary.

[Kees Cook (kees)]

Trivial typo adjustment. I'll upload a fix to get these in line again.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-08 02:00:05 +0000
+++ debian/changelog	2011-04-08 09:15:59 +0000
@@ -15,7 +15,7 @@
 
   [ Martin Pitt ]
   * Add xdg-update-menu-caonicalize-defaults.list.diff: Don't overwrite a
-    /usr/share/applications/defaults.list symlink. Thanks to Joe Ebel for the
+    /usr/share/applications/defaults.list symlink. Thanks to Joel Ebel for the
     original patch! (LP: #703106)
   
   [ Scott Ritchie ]

=== modified file 'debian/patches/xdg-update-menu-caonicalize-defaults.list.diff'
--- debian/patches/xdg-update-menu-caonicalize-defaults.list.diff	2011-03-30 13:11:39 +0000
+++ debian/patches/xdg-update-menu-caonicalize-defaults.list.diff	2011-04-08 09:15:59 +0000
@@ -6,7 +6,7 @@
 Canonicalize the defaults.list file name before overwriting it, to avoid
 replacing symlinks with files.
 
-Thanks to Joe Ebel for the original patch!
+Thanks to Joel Ebel for the original patch!
 
 Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35794
 Bug-Ubuntu: https://launchpad.net/bugs/703106