Import patches-unapplied version 1.104 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 57607833950dda2f4a479cf29bfa9073af615dfe

New changelog entries:
  * Rename Ubuntu Netbook Remix to Ubuntu Netbook.

.bzr/branch/branch.conf

@@ -1,2 +1,3 @@
-parent_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/
-push_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/
+bound_location = sftp://stevenk@bazaar.launchpad.net/%7Eubuntu-core-dev/livecd-rootfs/trunk/
+bound = True
+submit_branch = bzr+ssh://bazaar.launchpad.net/%7Emcasadevall/livecd-rootfs/armel-subarchs/

.bzr/checkout/conflicts

@@ -1 +1,19 @@
 BZR conflict list format 1
+path: debian/changelog
+type: text conflict
+file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.1
+
+path: debian/changelog.BASE.moved
+type: duplicate
+action: Moved existing file to
+conflict_path: debian/changelog.BASE
+
+path: debian/changelog.OTHER.moved
+type: duplicate
+action: Moved existing file to
+conflict_path: debian/changelog.OTHER
+
+path: debian/changelog.THIS.moved
+type: duplicate
+action: Moved existing file to
+conflict_path: debian/changelog.THIS

.bzr/checkout/merge-hashes

@@ -1,24 +1,6 @@
 BZR merge-modified list format 1
-file_id: install-20090915121554-otmzarujps4xkdqv-1
-hash: 68235c6b00888aab6a9fdbb1446430fbd0e64de3
-
-file_id: examples-20090915121554-otmzarujps4xkdqv-2
-hash: b6db287e0f6bbfea030c805034e280c9da03421f
-
 file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.1
-hash: 2ffff6e16e4020a03e86122f99e21e03a037ca3d
-
-file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.2
-hash: 233e7b0bca2804797b4ebafc1cf13589c73b5831
+hash: be4c9247502209f1e471e0c0ff66871cf0f75841
 
 file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.5
-hash: 7ea26bb2ca895b5184f4c312c1eb07945751805c
-
-file_id: x_LaMont_Jones_<lamont@debian.org>_Sat_Sep_24_15:53:42_2005_5414.0
-hash: d3964f9dad9f60363c81b688324d95b4ec7c8038
-
-file_id: bzrignore-20090915121918-f5nuhil3asvkoxz4-1
-hash: a855a24b17c220121ca49f1018e3386cf0049822
-
-file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.6
-hash: 1526d364e7dd50d68aafe0b51bfb7a8427f5b9e2
+hash: af6a52024eda0978b30f6442b936b80cb640a256