Merge lp:~ubuntu-branches/ubuntu/maverick/kerneloops/maverick-201010010911 into lp:ubuntu/maverick/kerneloops

[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/maverick/kerneloops now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/kerneloops/maverick-201010010911. A merge should be performed if necessary.

Unmerged revisions

21. By James Westby on 2010-09-28

Fix destination in changelog.

20. By James Westby on 2010-09-28

Disable kerneloops for final release.

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-28 09:34:47 +0000
+++ debian/changelog	2010-10-01 09:16:05 +0000
@@ -1,9 +1,18 @@
+<<<<<<< TREE
 kerneloops (0.12+git20090217-1ubuntu9) maverick; urgency=low
 
   * Disable kerneloops for final release.
 
  -- Martin Pitt <[e-mail]>  Tue, 28 Sep 2010 09:34:47 +0200
 
+=======
+kerneloops (0.12+git20090217-1ubuntu9) maverick; urgency=low
+
+  * Disable kerneloops for final release.
+
+ -- James Westby <[e-mail]>  Tue, 28 Sep 2010 14:39:41 -0400
+
+>>>>>>> MERGE-SOURCE
 kerneloops (0.12+git20090217-1ubuntu8) maverick; urgency=low
 
   * Re-enable kerneloops for maverick.