Merge lp:~arky/ubuntu/karmic/module-init-tools/fix-411534 into lp:~ubuntu-core-dev/module-init-tools/ubuntu

[arky]

[arky (arky)]

fixes bug 411534

Unmerged revisions

185. By arky on 2009-09-10

fixes modprobe.d dangling symlink (LP: #411534)

=== modified file 'debian/changelog'
--- debian/changelog	2009-08-07 16:22:23 +0000
+++ debian/changelog	2009-09-10 07:54:19 +0000
@@ -1,3 +1,9 @@
+module-init-tools (3.10-2ubuntu1) karmic; urgency=low
+
+  * fixes modprobe.d dangling symlink (LP: #411534)
+
+ -- Rakesh 'arky' Ambati <[e-mail]>  Thu, 10 Sep 2009 13:22:47 +0530
+
 module-init-tools (3.10-2) karmic; urgency=low
 
   * blacklist.conf: Blacklist pcspkr. It produces an ugly and loud noise,
 
=== modified file 'modprobe.d.5'
--- modprobe.d.5	2009-05-27 16:54:08 +0000
+++ modprobe.d.5	2009-09-10 07:54:19 +0000
@@ -1,1 +1,1 @@
-.so modprobe.conf.5
+.so man5/modprobe.conf.5