diff --git a/.bzr/branch/branch.conf b/.bzr/branch/branch.conf
index 0ff52035..3f030e74 100644
--- a/.bzr/branch/branch.conf
+++ b/.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/
diff --git a/.bzr/checkout/conflicts b/.bzr/checkout/conflicts
index 0dc2d3a0..397da9fb 100644
--- a/.bzr/checkout/conflicts
+++ b/.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
diff --git a/.bzr/checkout/dirstate b/.bzr/checkout/dirstate
index 7fda085d..1621e065 100644
Binary files a/.bzr/checkout/dirstate and b/.bzr/checkout/dirstate differ
diff --git a/.bzr/checkout/merge-hashes b/.bzr/checkout/merge-hashes
index 300475ec..c3424d23 100644
--- a/.bzr/checkout/merge-hashes
+++ b/.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
diff --git a/.bzr/repository/indices/1c52b9333bf6a33c08d0b58f6277f8dd.iix b/.bzr/repository/indices/1c52b9333bf6a33c08d0b58f6277f8dd.iix
new file mode 100644
index 00000000..75a5e4a4
Binary files /dev/null and b/.bzr/repository/indices/1c52b9333bf6a33c08d0b58f6277f8dd.iix differ
diff --git a/.bzr/repository/indices/1c52b9333bf6a33c08d0b58f6277f8dd.rix b/.bzr/repository/indices/1c52b9333bf6a33c08d0b58f6277f8dd.rix
new file mode 100644
index 00000000..71902fe9
Binary files /dev/null and b/.bzr/repository/indices/1c52b9333bf6a33c08d0b58f6277f8dd.rix differ
diff --git a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.six b/.bzr/repository/indices/1c52b9333bf6a33c08d0b58f6277f8dd.six
similarity index 100%
rename from .bzr/repository/indices/585aae83282152e62ec90749692bd0a7.six
rename to .bzr/repository/indices/1c52b9333bf6a33c08d0b58f6277f8dd.six
diff --git a/.bzr/repository/indices/f7010c6d2df52ea2d878abf35c556631.tix b/.bzr/repository/indices/1c52b9333bf6a33c08d0b58f6277f8dd.tix
similarity index 68%
rename from .bzr/repository/indices/f7010c6d2df52ea2d878abf35c556631.tix
rename to .bzr/repository/indices/1c52b9333bf6a33c08d0b58f6277f8dd.tix
index 6379dadc..6dff7b36 100644
Binary files a/.bzr/repository/indices/f7010c6d2df52ea2d878abf35c556631.tix and b/.bzr/repository/indices/1c52b9333bf6a33c08d0b58f6277f8dd.tix differ
diff --git a/.bzr/repository/indices/1d87ace02aa20c892dd2e6e948a65114.iix b/.bzr/repository/indices/1d87ace02aa20c892dd2e6e948a65114.iix
new file mode 100644
index 00000000..d03c2058
Binary files /dev/null and b/.bzr/repository/indices/1d87ace02aa20c892dd2e6e948a65114.iix differ
diff --git a/.bzr/repository/indices/1d87ace02aa20c892dd2e6e948a65114.rix b/.bzr/repository/indices/1d87ace02aa20c892dd2e6e948a65114.rix
new file mode 100644
index 00000000..d590e2b6
Binary files /dev/null and b/.bzr/repository/indices/1d87ace02aa20c892dd2e6e948a65114.rix differ
diff --git a/.bzr/repository/indices/1d87ace02aa20c892dd2e6e948a65114.six b/.bzr/repository/indices/1d87ace02aa20c892dd2e6e948a65114.six
new file mode 100644
index 00000000..4ea467d1
Binary files /dev/null and b/.bzr/repository/indices/1d87ace02aa20c892dd2e6e948a65114.six differ
diff --git a/.bzr/repository/indices/1d87ace02aa20c892dd2e6e948a65114.tix b/.bzr/repository/indices/1d87ace02aa20c892dd2e6e948a65114.tix
new file mode 100644
index 00000000..bea5a37d
Binary files /dev/null and b/.bzr/repository/indices/1d87ace02aa20c892dd2e6e948a65114.tix differ
diff --git a/.bzr/repository/indices/222cfef29f98d578539f3e1f87a0c100.iix b/.bzr/repository/indices/222cfef29f98d578539f3e1f87a0c100.iix
deleted file mode 100644
index 02d2d1d8..00000000
Binary files a/.bzr/repository/indices/222cfef29f98d578539f3e1f87a0c100.iix and /dev/null differ
diff --git a/.bzr/repository/indices/222cfef29f98d578539f3e1f87a0c100.rix b/.bzr/repository/indices/222cfef29f98d578539f3e1f87a0c100.rix
deleted file mode 100644
index b6e62957..00000000
Binary files a/.bzr/repository/indices/222cfef29f98d578539f3e1f87a0c100.rix and /dev/null differ
diff --git a/.bzr/repository/indices/222cfef29f98d578539f3e1f87a0c100.six b/.bzr/repository/indices/222cfef29f98d578539f3e1f87a0c100.six
deleted file mode 100644
index cfd5a3af..00000000
Binary files a/.bzr/repository/indices/222cfef29f98d578539f3e1f87a0c100.six and /dev/null differ
diff --git a/.bzr/repository/indices/222cfef29f98d578539f3e1f87a0c100.tix b/.bzr/repository/indices/222cfef29f98d578539f3e1f87a0c100.tix
deleted file mode 100644
index 08f71009..00000000
Binary files a/.bzr/repository/indices/222cfef29f98d578539f3e1f87a0c100.tix and /dev/null differ
diff --git a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.iix b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.iix
deleted file mode 100644
index 42508863..00000000
Binary files a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.iix and /dev/null differ
diff --git a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.rix b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.rix
deleted file mode 100644
index b0681231..00000000
Binary files a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.rix and /dev/null differ
diff --git a/.bzr/repository/indices/7da3ed26c383b67cfd3650eb71a608aa.iix b/.bzr/repository/indices/7da3ed26c383b67cfd3650eb71a608aa.iix
deleted file mode 100644
index 0d2dafeb..00000000
Binary files a/.bzr/repository/indices/7da3ed26c383b67cfd3650eb71a608aa.iix and /dev/null differ
diff --git a/.bzr/repository/indices/7da3ed26c383b67cfd3650eb71a608aa.rix b/.bzr/repository/indices/7da3ed26c383b67cfd3650eb71a608aa.rix
deleted file mode 100644
index dbfe6313..00000000
Binary files a/.bzr/repository/indices/7da3ed26c383b67cfd3650eb71a608aa.rix and /dev/null differ
diff --git a/.bzr/repository/indices/7da3ed26c383b67cfd3650eb71a608aa.tix b/.bzr/repository/indices/7da3ed26c383b67cfd3650eb71a608aa.tix
deleted file mode 100644
index 93130cba..00000000
Binary files a/.bzr/repository/indices/7da3ed26c383b67cfd3650eb71a608aa.tix and /dev/null differ
diff --git a/.bzr/repository/indices/89c24db89495df252a7d543786eaac74.iix b/.bzr/repository/indices/89c24db89495df252a7d543786eaac74.iix
new file mode 100644
index 00000000..e818d1ed
Binary files /dev/null and b/.bzr/repository/indices/89c24db89495df252a7d543786eaac74.iix differ
diff --git a/.bzr/repository/indices/89c24db89495df252a7d543786eaac74.rix b/.bzr/repository/indices/89c24db89495df252a7d543786eaac74.rix
new file mode 100644
index 00000000..35db26cf
Binary files /dev/null and b/.bzr/repository/indices/89c24db89495df252a7d543786eaac74.rix differ
diff --git a/.bzr/repository/indices/7da3ed26c383b67cfd3650eb71a608aa.six b/.bzr/repository/indices/89c24db89495df252a7d543786eaac74.six
similarity index 100%
rename from .bzr/repository/indices/7da3ed26c383b67cfd3650eb71a608aa.six
rename to .bzr/repository/indices/89c24db89495df252a7d543786eaac74.six
diff --git a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.tix b/.bzr/repository/indices/89c24db89495df252a7d543786eaac74.tix
similarity index 53%
rename from .bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.tix
rename to .bzr/repository/indices/89c24db89495df252a7d543786eaac74.tix
index 6fa31ef2..c5776ea1 100644
Binary files a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.tix and b/.bzr/repository/indices/89c24db89495df252a7d543786eaac74.tix differ
diff --git a/.bzr/repository/indices/a4e27862ddd207f0941b8728e5528217.iix b/.bzr/repository/indices/a4e27862ddd207f0941b8728e5528217.iix
new file mode 100644
index 00000000..4abce18b
Binary files /dev/null and b/.bzr/repository/indices/a4e27862ddd207f0941b8728e5528217.iix differ
diff --git a/.bzr/repository/indices/a4e27862ddd207f0941b8728e5528217.rix b/.bzr/repository/indices/a4e27862ddd207f0941b8728e5528217.rix
new file mode 100644
index 00000000..63e5fd74
Binary files /dev/null and b/.bzr/repository/indices/a4e27862ddd207f0941b8728e5528217.rix differ
diff --git a/.bzr/repository/indices/b822d61649923ed4df542e791ed76b05.six b/.bzr/repository/indices/a4e27862ddd207f0941b8728e5528217.six
similarity index 100%
rename from .bzr/repository/indices/b822d61649923ed4df542e791ed76b05.six
rename to .bzr/repository/indices/a4e27862ddd207f0941b8728e5528217.six
diff --git a/.bzr/repository/indices/a4e27862ddd207f0941b8728e5528217.tix b/.bzr/repository/indices/a4e27862ddd207f0941b8728e5528217.tix
new file mode 100644
index 00000000..d810ca44
Binary files /dev/null and b/.bzr/repository/indices/a4e27862ddd207f0941b8728e5528217.tix differ
diff --git a/.bzr/repository/indices/b822d61649923ed4df542e791ed76b05.iix b/.bzr/repository/indices/b822d61649923ed4df542e791ed76b05.iix
deleted file mode 100644
index c5d92bca..00000000
Binary files a/.bzr/repository/indices/b822d61649923ed4df542e791ed76b05.iix and /dev/null differ
diff --git a/.bzr/repository/indices/b822d61649923ed4df542e791ed76b05.rix b/.bzr/repository/indices/b822d61649923ed4df542e791ed76b05.rix
deleted file mode 100644
index d80feee5..00000000
Binary files a/.bzr/repository/indices/b822d61649923ed4df542e791ed76b05.rix and /dev/null differ
diff --git a/.bzr/repository/indices/b822d61649923ed4df542e791ed76b05.tix b/.bzr/repository/indices/b822d61649923ed4df542e791ed76b05.tix
deleted file mode 100644
index 79a0b435..00000000
Binary files a/.bzr/repository/indices/b822d61649923ed4df542e791ed76b05.tix and /dev/null differ
diff --git a/.bzr/repository/indices/d7946eb61c1e4c68a326390385a8ffc1.iix b/.bzr/repository/indices/d7946eb61c1e4c68a326390385a8ffc1.iix
new file mode 100644
index 00000000..4fa16a13
Binary files /dev/null and b/.bzr/repository/indices/d7946eb61c1e4c68a326390385a8ffc1.iix differ
diff --git a/.bzr/repository/indices/d7946eb61c1e4c68a326390385a8ffc1.rix b/.bzr/repository/indices/d7946eb61c1e4c68a326390385a8ffc1.rix
new file mode 100644
index 00000000..a54454c7
Binary files /dev/null and b/.bzr/repository/indices/d7946eb61c1e4c68a326390385a8ffc1.rix differ
diff --git a/.bzr/repository/indices/d7946eb61c1e4c68a326390385a8ffc1.six b/.bzr/repository/indices/d7946eb61c1e4c68a326390385a8ffc1.six
new file mode 100644
index 00000000..ceeb0dd7
Binary files /dev/null and b/.bzr/repository/indices/d7946eb61c1e4c68a326390385a8ffc1.six differ
diff --git a/.bzr/repository/indices/d7946eb61c1e4c68a326390385a8ffc1.tix b/.bzr/repository/indices/d7946eb61c1e4c68a326390385a8ffc1.tix
new file mode 100644
index 00000000..0fde5301
Binary files /dev/null and b/.bzr/repository/indices/d7946eb61c1e4c68a326390385a8ffc1.tix differ
diff --git a/.bzr/repository/indices/f7010c6d2df52ea2d878abf35c556631.iix b/.bzr/repository/indices/f7010c6d2df52ea2d878abf35c556631.iix
deleted file mode 100644
index bfeff7c1..00000000
Binary files a/.bzr/repository/indices/f7010c6d2df52ea2d878abf35c556631.iix and /dev/null differ
diff --git a/.bzr/repository/indices/f7010c6d2df52ea2d878abf35c556631.rix b/.bzr/repository/indices/f7010c6d2df52ea2d878abf35c556631.rix
deleted file mode 100644
index a5e21626..00000000
Binary files a/.bzr/repository/indices/f7010c6d2df52ea2d878abf35c556631.rix and /dev/null differ
diff --git a/.bzr/repository/indices/fc98b94e49d1b70b307f7ec4fe34bd6a.iix b/.bzr/repository/indices/fc98b94e49d1b70b307f7ec4fe34bd6a.iix
deleted file mode 100644
index 319e5ed7..00000000
Binary files a/.bzr/repository/indices/fc98b94e49d1b70b307f7ec4fe34bd6a.iix and /dev/null differ
diff --git a/.bzr/repository/indices/fc98b94e49d1b70b307f7ec4fe34bd6a.rix b/.bzr/repository/indices/fc98b94e49d1b70b307f7ec4fe34bd6a.rix
deleted file mode 100644
index b70a1b3b..00000000
Binary files a/.bzr/repository/indices/fc98b94e49d1b70b307f7ec4fe34bd6a.rix and /dev/null differ
diff --git a/.bzr/repository/indices/fc98b94e49d1b70b307f7ec4fe34bd6a.six b/.bzr/repository/indices/fc98b94e49d1b70b307f7ec4fe34bd6a.six
deleted file mode 100644
index 74bda27c..00000000
Binary files a/.bzr/repository/indices/fc98b94e49d1b70b307f7ec4fe34bd6a.six and /dev/null differ
diff --git a/.bzr/repository/indices/fc98b94e49d1b70b307f7ec4fe34bd6a.tix b/.bzr/repository/indices/fc98b94e49d1b70b307f7ec4fe34bd6a.tix
deleted file mode 100644
index d4aefdfb..00000000
Binary files a/.bzr/repository/indices/fc98b94e49d1b70b307f7ec4fe34bd6a.tix and /dev/null differ
diff --git a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.iix b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.iix
deleted file mode 100644
index 0ac9f859..00000000
Binary files a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.iix and /dev/null differ
diff --git a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.rix b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.rix
deleted file mode 100644
index 9d4797a6..00000000
Binary files a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.rix and /dev/null differ
diff --git a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.six b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.six
deleted file mode 100644
index 957bd400..00000000
Binary files a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.six and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.iix b/.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.iix
new file mode 100644
index 00000000..149f2310
Binary files /dev/null and b/.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.iix differ
diff --git a/.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.pack b/.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.pack
new file mode 100644
index 00000000..307b55e5
Binary files /dev/null and b/.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.pack differ
diff --git a/.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.rix b/.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.rix
new file mode 100644
index 00000000..2cb72e23
Binary files /dev/null and b/.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.rix differ
diff --git a/.bzr/repository/indices/f7010c6d2df52ea2d878abf35c556631.six b/.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.six
similarity index 100%
rename from .bzr/repository/indices/f7010c6d2df52ea2d878abf35c556631.six
rename to .bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.six
diff --git a/.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.tix b/.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.tix
similarity index 54%
rename from .bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.tix
rename to .bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.tix
index 835bfa36..2ec9f3f8 100644
Binary files a/.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.tix and b/.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.tix differ
diff --git a/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.iix b/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.iix
new file mode 100644
index 00000000..8ddbd6c2
Binary files /dev/null and b/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.iix differ
diff --git a/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.pack b/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.pack
new file mode 100644
index 00000000..1149580a
Binary files /dev/null and b/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.pack differ
diff --git a/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.rix b/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.rix
new file mode 100644
index 00000000..7bedd06c
Binary files /dev/null and b/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.rix differ
diff --git a/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.six b/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.six
new file mode 100644
index 00000000..291501f6
Binary files /dev/null and b/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.six differ
diff --git a/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.tix b/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.tix
new file mode 100644
index 00000000..bbdb663e
Binary files /dev/null and b/.bzr/repository/obsolete_packs/1474204eac12f80ced367939b5faa185.tix differ
diff --git a/.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.iix b/.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.iix
new file mode 100644
index 00000000..f086c35c
Binary files /dev/null and b/.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.iix differ
diff --git a/.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.pack b/.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.pack
new file mode 100644
index 00000000..7b6874ef
Binary files /dev/null and b/.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.pack differ
diff --git a/.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.rix b/.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.rix
new file mode 100644
index 00000000..6b12412c
Binary files /dev/null and b/.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.rix differ
diff --git a/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.six b/.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.six
similarity index 100%
rename from .bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.six
rename to .bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.six
diff --git a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.tix b/.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.tix
similarity index 56%
rename from .bzr/repository/indices/585aae83282152e62ec90749692bd0a7.tix
rename to .bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.tix
index b19da696..17554aee 100644
Binary files a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.tix and b/.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.tix differ
diff --git a/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.iix b/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.iix
deleted file mode 100644
index 89e7807b..00000000
Binary files a/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.iix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.pack b/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.pack
deleted file mode 100644
index 71fc5b4f..00000000
Binary files a/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.pack and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.rix b/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.rix
deleted file mode 100644
index b45f6a48..00000000
Binary files a/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.rix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.tix b/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.tix
deleted file mode 100644
index 0aeca224..00000000
Binary files a/.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.tix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.iix b/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.iix
new file mode 100644
index 00000000..aa5da765
Binary files /dev/null and b/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.iix differ
diff --git a/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.pack b/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.pack
new file mode 100644
index 00000000..5b7c5257
Binary files /dev/null and b/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.pack differ
diff --git a/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.rix b/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.rix
new file mode 100644
index 00000000..4f88819e
Binary files /dev/null and b/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.rix differ
diff --git a/.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.six b/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.six
similarity index 100%
rename from .bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.six
rename to .bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.six
diff --git a/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.tix b/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.tix
new file mode 100644
index 00000000..2e1ed720
Binary files /dev/null and b/.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.tix differ
diff --git a/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.iix b/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.iix
new file mode 100644
index 00000000..97a310cc
Binary files /dev/null and b/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.iix differ
diff --git a/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.pack b/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.pack
new file mode 100644
index 00000000..9c3df5f0
Binary files /dev/null and b/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.pack differ
diff --git a/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.rix b/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.rix
new file mode 100644
index 00000000..08fd892e
Binary files /dev/null and b/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.rix differ
diff --git a/.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.six b/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.six
similarity index 100%
rename from .bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.six
rename to .bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.six
diff --git a/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.tix b/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.tix
new file mode 100644
index 00000000..fcb04d26
Binary files /dev/null and b/.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.tix differ
diff --git a/.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.iix b/.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.iix
deleted file mode 100644
index 336b1dd4..00000000
Binary files a/.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.iix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.pack b/.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.pack
deleted file mode 100644
index 167f24ec..00000000
Binary files a/.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.pack and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.rix b/.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.rix
deleted file mode 100644
index 8c21353f..00000000
Binary files a/.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.rix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.iix b/.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.iix
deleted file mode 100644
index 6e8eaf59..00000000
Binary files a/.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.iix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.pack b/.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.pack
deleted file mode 100644
index fbcbeae3..00000000
Binary files a/.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.pack and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.rix b/.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.rix
deleted file mode 100644
index 22d9e329..00000000
Binary files a/.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.rix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.iix b/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.iix
new file mode 100644
index 00000000..a5d19071
Binary files /dev/null and b/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.iix differ
diff --git a/.bzr/repository/packs/222cfef29f98d578539f3e1f87a0c100.pack b/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.pack
similarity index 83%
rename from .bzr/repository/packs/222cfef29f98d578539f3e1f87a0c100.pack
rename to .bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.pack
index bd477130..8f0477b3 100644
Binary files a/.bzr/repository/packs/222cfef29f98d578539f3e1f87a0c100.pack and b/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.pack differ
diff --git a/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.rix b/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.rix
new file mode 100644
index 00000000..49924ced
Binary files /dev/null and b/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.rix differ
diff --git a/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.six b/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.six
new file mode 100644
index 00000000..8de9230d
Binary files /dev/null and b/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.six differ
diff --git a/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.tix b/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.tix
new file mode 100644
index 00000000..d0707bcb
Binary files /dev/null and b/.bzr/repository/obsolete_packs/79446d2c2843e5b8336d7ad61eedd86c.tix differ
diff --git a/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.iix b/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.iix
deleted file mode 100644
index 80f0b18e..00000000
Binary files a/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.iix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.pack b/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.pack
deleted file mode 100644
index c11800a0..00000000
Binary files a/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.pack and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.rix b/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.rix
deleted file mode 100644
index edca13de..00000000
Binary files a/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.rix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.tix b/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.tix
deleted file mode 100644
index 9054e0a3..00000000
Binary files a/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.tix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.iix b/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.iix
deleted file mode 100644
index 56291fd1..00000000
Binary files a/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.iix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.pack b/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.pack
deleted file mode 100644
index 5899558c..00000000
Binary files a/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.pack and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.rix b/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.rix
deleted file mode 100644
index 000b1aca..00000000
Binary files a/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.rix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.tix b/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.tix
deleted file mode 100644
index 349ec794..00000000
Binary files a/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.tix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.iix b/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.iix
new file mode 100644
index 00000000..47bb9e0a
Binary files /dev/null and b/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.iix differ
diff --git a/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.pack b/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.pack
new file mode 100644
index 00000000..383e797b
Binary files /dev/null and b/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.pack differ
diff --git a/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.rix b/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.rix
new file mode 100644
index 00000000..0c0fe3c8
Binary files /dev/null and b/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.rix differ
diff --git a/.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.six b/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.six
similarity index 100%
rename from .bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.six
rename to .bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.six
diff --git a/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.tix b/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.tix
new file mode 100644
index 00000000..1e733686
Binary files /dev/null and b/.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.tix differ
diff --git a/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.iix b/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.iix
deleted file mode 100644
index 25fd7b83..00000000
Binary files a/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.iix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.pack b/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.pack
deleted file mode 100644
index fe2fed20..00000000
Binary files a/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.pack and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.rix b/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.rix
deleted file mode 100644
index 53436570..00000000
Binary files a/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.rix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.tix b/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.tix
deleted file mode 100644
index 25406fe9..00000000
Binary files a/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.tix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.iix b/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.iix
deleted file mode 100644
index c6b1c479..00000000
Binary files a/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.iix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.pack b/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.pack
deleted file mode 100644
index e9b0b3d5..00000000
Binary files a/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.pack and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.rix b/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.rix
deleted file mode 100644
index aa8916e2..00000000
Binary files a/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.rix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.tix b/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.tix
deleted file mode 100644
index 12d097cb..00000000
Binary files a/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.tix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.iix b/.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.iix
new file mode 100644
index 00000000..a44a8991
Binary files /dev/null and b/.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.iix differ
diff --git a/.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.pack b/.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.pack
new file mode 100644
index 00000000..a4a0fa30
Binary files /dev/null and b/.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.pack differ
diff --git a/.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.rix b/.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.rix
new file mode 100644
index 00000000..3f2a980a
Binary files /dev/null and b/.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.rix differ
diff --git a/.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.six b/.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.six
similarity index 100%
rename from .bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.six
rename to .bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.six
diff --git a/.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.tix b/.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.tix
similarity index 52%
rename from .bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.tix
rename to .bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.tix
index 33bca614..d4238c80 100644
Binary files a/.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.tix and b/.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.tix differ
diff --git a/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.iix b/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.iix
new file mode 100644
index 00000000..a785a35d
Binary files /dev/null and b/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.iix differ
diff --git a/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.pack b/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.pack
new file mode 100644
index 00000000..fa081a27
Binary files /dev/null and b/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.pack differ
diff --git a/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.rix b/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.rix
new file mode 100644
index 00000000..ba3c7001
Binary files /dev/null and b/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.rix differ
diff --git a/.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.six b/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.six
similarity index 100%
rename from .bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.six
rename to .bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.six
diff --git a/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.tix b/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.tix
new file mode 100644
index 00000000..d5c07196
Binary files /dev/null and b/.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.tix differ
diff --git a/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.iix b/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.iix
new file mode 100644
index 00000000..45825b40
Binary files /dev/null and b/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.iix differ
diff --git a/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.pack b/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.pack
new file mode 100644
index 00000000..a92baa70
Binary files /dev/null and b/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.pack differ
diff --git a/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.rix b/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.rix
new file mode 100644
index 00000000..ea5959c2
Binary files /dev/null and b/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.rix differ
diff --git a/.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.six b/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.six
similarity index 100%
rename from .bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.six
rename to .bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.six
diff --git a/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.tix b/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.tix
new file mode 100644
index 00000000..44bd4fd3
Binary files /dev/null and b/.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.tix differ
diff --git a/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.iix b/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.iix
new file mode 100644
index 00000000..f302a067
Binary files /dev/null and b/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.iix differ
diff --git a/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.pack b/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.pack
new file mode 100644
index 00000000..a38ddae5
Binary files /dev/null and b/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.pack differ
diff --git a/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.rix b/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.rix
new file mode 100644
index 00000000..9fa63a45
Binary files /dev/null and b/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.rix differ
diff --git a/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.six b/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.six
new file mode 100644
index 00000000..8bbb36c3
Binary files /dev/null and b/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.six differ
diff --git a/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.tix b/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.tix
new file mode 100644
index 00000000..71cfdfba
Binary files /dev/null and b/.bzr/repository/obsolete_packs/e81d57dca2c10083413a312650ea6cff.tix differ
diff --git a/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.iix b/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.iix
deleted file mode 100644
index 23729e8b..00000000
Binary files a/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.iix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.pack b/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.pack
deleted file mode 100644
index ec9d269d..00000000
Binary files a/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.pack and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.rix b/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.rix
deleted file mode 100644
index f7c8861f..00000000
Binary files a/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.rix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.six b/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.six
deleted file mode 100644
index 1206f930..00000000
--- a/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.six
+++ /dev/null
@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-
diff --git a/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.tix b/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.tix
deleted file mode 100644
index 97e17999..00000000
Binary files a/.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.tix and /dev/null differ
diff --git a/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.iix b/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.iix
new file mode 100644
index 00000000..4f13fc45
Binary files /dev/null and b/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.iix differ
diff --git a/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.pack b/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.pack
new file mode 100644
index 00000000..28e7206a
Binary files /dev/null and b/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.pack differ
diff --git a/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.rix b/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.rix
new file mode 100644
index 00000000..ff8cbac7
Binary files /dev/null and b/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.rix differ
diff --git a/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.six b/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.six
new file mode 100644
index 00000000..e18f62da
Binary files /dev/null and b/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.six differ
diff --git a/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.tix b/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.tix
new file mode 100644
index 00000000..ce63c45f
Binary files /dev/null and b/.bzr/repository/obsolete_packs/f6308a610cf4c9a1b4d16cdd772aea66.tix differ
diff --git a/.bzr/repository/pack-names b/.bzr/repository/pack-names
index a5b57a54..98c8d2a6 100644
Binary files a/.bzr/repository/pack-names and b/.bzr/repository/pack-names differ
diff --git a/.bzr/repository/packs/f7010c6d2df52ea2d878abf35c556631.pack b/.bzr/repository/packs/1c52b9333bf6a33c08d0b58f6277f8dd.pack
similarity index 56%
rename from .bzr/repository/packs/f7010c6d2df52ea2d878abf35c556631.pack
rename to .bzr/repository/packs/1c52b9333bf6a33c08d0b58f6277f8dd.pack
index 822d5c8b..21b75f1c 100644
Binary files a/.bzr/repository/packs/f7010c6d2df52ea2d878abf35c556631.pack and b/.bzr/repository/packs/1c52b9333bf6a33c08d0b58f6277f8dd.pack differ
diff --git a/.bzr/repository/packs/1d87ace02aa20c892dd2e6e948a65114.pack b/.bzr/repository/packs/1d87ace02aa20c892dd2e6e948a65114.pack
new file mode 100644
index 00000000..c1cdfc36
Binary files /dev/null and b/.bzr/repository/packs/1d87ace02aa20c892dd2e6e948a65114.pack differ
diff --git a/.bzr/repository/packs/585aae83282152e62ec90749692bd0a7.pack b/.bzr/repository/packs/585aae83282152e62ec90749692bd0a7.pack
deleted file mode 100644
index 4657950e..00000000
Binary files a/.bzr/repository/packs/585aae83282152e62ec90749692bd0a7.pack and /dev/null differ
diff --git a/.bzr/repository/packs/7da3ed26c383b67cfd3650eb71a608aa.pack b/.bzr/repository/packs/7da3ed26c383b67cfd3650eb71a608aa.pack
deleted file mode 100644
index c94dadc9..00000000
Binary files a/.bzr/repository/packs/7da3ed26c383b67cfd3650eb71a608aa.pack and /dev/null differ
diff --git a/.bzr/repository/packs/fcfa609e6770bb697bbea1202ae42de4.pack b/.bzr/repository/packs/89c24db89495df252a7d543786eaac74.pack
similarity index 73%
rename from .bzr/repository/packs/fcfa609e6770bb697bbea1202ae42de4.pack
rename to .bzr/repository/packs/89c24db89495df252a7d543786eaac74.pack
index f20adbb3..82676445 100644
Binary files a/.bzr/repository/packs/fcfa609e6770bb697bbea1202ae42de4.pack and b/.bzr/repository/packs/89c24db89495df252a7d543786eaac74.pack differ
diff --git a/.bzr/repository/packs/a4e27862ddd207f0941b8728e5528217.pack b/.bzr/repository/packs/a4e27862ddd207f0941b8728e5528217.pack
new file mode 100644
index 00000000..7d496380
Binary files /dev/null and b/.bzr/repository/packs/a4e27862ddd207f0941b8728e5528217.pack differ
diff --git a/.bzr/repository/packs/b822d61649923ed4df542e791ed76b05.pack b/.bzr/repository/packs/b822d61649923ed4df542e791ed76b05.pack
deleted file mode 100644
index 2b5c9d20..00000000
Binary files a/.bzr/repository/packs/b822d61649923ed4df542e791ed76b05.pack and /dev/null differ
diff --git a/.bzr/repository/packs/d7946eb61c1e4c68a326390385a8ffc1.pack b/.bzr/repository/packs/d7946eb61c1e4c68a326390385a8ffc1.pack
new file mode 100644
index 00000000..790ff0d5
Binary files /dev/null and b/.bzr/repository/packs/d7946eb61c1e4c68a326390385a8ffc1.pack differ
diff --git a/.bzr/repository/packs/fc98b94e49d1b70b307f7ec4fe34bd6a.pack b/.bzr/repository/packs/fc98b94e49d1b70b307f7ec4fe34bd6a.pack
deleted file mode 100644
index 67650b31..00000000
Binary files a/.bzr/repository/packs/fc98b94e49d1b70b307f7ec4fe34bd6a.pack and /dev/null differ
diff --git a/BuildLiveCD b/BuildLiveCD
index 2e83ef0a..62570762 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -74,7 +74,7 @@ fi
 if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
     set -- ubuntu kubuntu kubuntu-netbook edubuntu xubuntu mythbuntu base
     if [ "$ARCH" = "i386" ]; then
-        set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook-remix kubuntu kubuntu-dvd kubuntu-netbook edubuntu edubuntu-dvd xubuntu mythbuntu base
+        set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook kubuntu kubuntu-dvd kubuntu-netbook edubuntu edubuntu-dvd xubuntu mythbuntu base
     fi
 fi
 
@@ -85,7 +85,7 @@ esac
 
 for arg in "$@"; do
     case "$arg" in
-	*ubuntu|*ubuntu-dvd|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook-remix|ubuntu-moblin-remix|mythbuntu|base|tocd)	;;
+	*ubuntu|*ubuntu-dvd|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|base|tocd)	;;
 	*)
 	    echo "bad project: $arg" >&2
 	    exit 2
diff --git a/debian/changelog b/debian/changelog
index f0f225aa..3655d602 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (1.104) lucid; urgency=low
+
+  * Rename Ubuntu Netbook Remix to Ubuntu Netbook.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Fri, 18 Dec 2009 14:16:26 +1100
+
 livecd-rootfs (1.103) lucid; urgency=low
 
   * make sure there is no old squashfs around before attempting to squash a
diff --git a/livecd.sh b/livecd.sh
index 0260edba..ce4bec4a 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -146,7 +146,7 @@ fi
 
 for arg in "$@"; do
     case "$arg" in
-       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook-remix|ubuntu-moblin-remix|base|tocd)
+       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|tocd)
 	    ;;
 	*)
 	    echo bad name >&2;
@@ -211,9 +211,9 @@ Flags: seen
 	    LIVELIST="mobile-live^ casper ubiquity"
 	    COMP="main restricted universe multiverse"
 	    ;;
-	ubuntu-netbook-remix)
-	    LIST="$LIST minimal^ standard^ ubuntu-netbook-remix^"
-	    LIVELIST="unr-live^ laptop-detect casper lupin-casper"
+	ubuntu-netbook)
+	    LIST="$LIST minimal^ standard^ ubuntu-netbook^"
+	    LIVELIST="netbook-live^ laptop-detect casper lupin-casper"
 	    ;;
 	mythbuntu)
 	    LIST="$LIST minimal^ standard^ mythbuntu-desktop^"