diff --git a/.bzr/branch/revision-history b/.bzr/branch/revision-history
index 92547804..fdc9ba72 100644
--- a/.bzr/branch/revision-history
+++ b/.bzr/branch/revision-history
@@ -138,4 +138,9 @@ doko@salsa-20071003155232-f4n9tdezdkcmn21z
 doko@salsa-20071004092543-qzap04qfo6i77h29
 doko@salsa-20071004110523-ab0qzrldakrxi9ap
 cjwatson@canonical.com-20071004132601-q4vup64i8pslbjqf
-cjwatson@canonical.com-20071004132641-fysek6ezu9658kb8
\ No newline at end of file
+cjwatson@canonical.com-20071004132641-fysek6ezu9658kb8
+doko@salsa-20071007121443-tsaye6lzm7b0h2dv
+cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy
+cjwatson@canonical.com-20071024160911-4egvg829efwoni0v
+cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb
+cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x
\ No newline at end of file
diff --git a/.bzr/checkout/dirstate b/.bzr/checkout/dirstate
index 4af9e95a..c5d50206 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 1809ae12..91772c3a 100644
--- a/.bzr/checkout/merge-hashes
+++ b/.bzr/checkout/merge-hashes
@@ -1,6 +1,6 @@
 BZR merge-modified list format 1
 file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.1
-hash: 8cacbca9d5c03153911b57eb746d5766258495b3
+hash: 0ec7221c57d8efa364281559e85bcccb7b555274
 
 file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.5
-hash: d130628966ba26d7f975099d310d1ec06c46ef8e
+hash: 24872caf33c2401ae7d97f5053940249f3990b51
diff --git a/.bzr/repository/inventory.kndx b/.bzr/repository/inventory.kndx
index 8c006ac8..e1fd8dbc 100644
--- a/.bzr/repository/inventory.kndx
+++ b/.bzr/repository/inventory.kndx
@@ -74,16 +74,16 @@ Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--pa
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-11 line-delta 30485 318 70 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-12 line-delta 30803 371 71 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--base-0 line-delta 31174 179 72 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 line-delta 31353 386 72 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-1 fulltext 31739 797 73 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-2 line-delta 32536 318 75 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-3 line-delta 32854 317 76 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-4 line-delta 33171 387 77 74 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-5 fulltext 33558 796 78 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-6 line-delta 34354 386 79 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-7 line-delta 34740 318 80 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--version-0 line-delta 35058 179 81 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--base-0 fulltext 35237 799 82 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-1 fulltext 31353 797 73 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-2 line-delta 32150 318 74 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-3 line-delta 32468 317 75 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-4 line-delta 32785 387 76 .Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-5 fulltext 33172 796 77 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-6 line-delta 33968 386 78 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-7 line-delta 34354 318 79 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--version-0 line-delta 34672 179 80 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 line-delta 34851 386 72 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--base-0 fulltext 35237 799 81 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-1 line-delta 36036 315 83 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-2 line-delta 36351 387 84 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-3 line-delta 36738 319 85 :
@@ -141,4 +141,9 @@ doko@salsa-20071003155232-f4n9tdezdkcmn21z line-delta 62386 419 136 :
 doko@salsa-20071004092543-qzap04qfo6i77h29 line-delta 62805 372 137 :
 doko@salsa-20071004110523-ab0qzrldakrxi9ap fulltext 63177 1086 138 :
 cjwatson@canonical.com-20071004132601-q4vup64i8pslbjqf line-delta 64263 375 139 :
-cjwatson@canonical.com-20071004132641-fysek6ezu9658kb8 line-delta 64638 307 140 :
\ No newline at end of file
+cjwatson@canonical.com-20071004132641-fysek6ezu9658kb8 line-delta 64638 307 140 :
+doko@salsa-20071007121443-tsaye6lzm7b0h2dv line-delta 64945 373 141 :
+cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy line-delta 65318 373 142 :
+cjwatson@canonical.com-20071024160911-4egvg829efwoni0v fulltext 65691 1086 143 :
+cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb line-delta 66777 373 144 :
+cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x line-delta 67150 304 145 :
\ No newline at end of file
diff --git a/.bzr/repository/inventory.knit b/.bzr/repository/inventory.knit
index baeb5ddf..bc73f3e0 100644
Binary files a/.bzr/repository/inventory.knit and b/.bzr/repository/inventory.knit differ
diff --git a/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx b/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx
index 019e957b..12452dd8 100644
--- a/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx
+++ b/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx
@@ -44,51 +44,56 @@ Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--pa
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-5 line-delta 17135 338 40 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-6 line-delta 17473 232 41 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-7 line-delta 17705 237 42 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-1 fulltext 17942 2477 43 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-2 line-delta 20419 255 44 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-5 line-delta 20674 301 45 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--version-0 line-delta 20975 236 46 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-1 line-delta 21211 293 47 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-2 line-delta 21504 249 48 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-3 line-delta 21753 255 49 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-4 line-delta 22008 256 50 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-5 line-delta 22264 283 51 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-6 line-delta 22547 250 52 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-7 line-delta 22797 180 53 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-8 fulltext 22977 3033 54 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-9 line-delta 26010 201 55 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-10 line-delta 26211 151 56 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-11 line-delta 26362 201 57 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-12 line-delta 26563 198 58 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-13 line-delta 26761 297 59 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-14 line-delta 27058 206 60 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-15 line-delta 27264 201 61 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-18 line-delta 27465 191 62 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-19 line-delta 27656 247 63 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-20 line-delta 27903 332 64 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-21 line-delta 28235 302 65 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-23 line-delta 28537 207 66 :
-adconrad@cthulhu-20070710101201-n6mhazrg3xo6h043 line-delta 28744 480 67 :
-adconrad@cthulhu-20070710110957-gehhqe29gby0w64n fulltext 29224 3859 68 :
-adconrad@cthulhu-20070710111704-rzdbrd27nejovd3q line-delta 33083 171 69 :
-adconrad@cthulhu-20070711152031-1bnsrdzee9w3vzqp line-delta 33254 275 70 :
-adconrad@cthulhu-20070718094329-l7657ic3yzpm8epj line-delta 33529 268 71 :
-cjwatson@canonical.com-20070721104812-1c5snruqsburbre3 line-delta 33797 355 72 :
-cjwatson@canonical.com-20070721134533-pg5lqdzfq9ovs3m1 line-delta 34152 217 73 :
-adconrad@cthulhu-20070803141049-u72kaejv1hwa2exk line-delta 34369 322 74 :
-adconrad@cthulhu-20070821135804-412oyi4xnwb2rte8 line-delta 34691 241 75 :
-cjwatson@canonical.com-20070907152510-hgild5g5q88dl7gp line-delta 34932 212 76 :
-cjwatson@canonical.com-20070907180808-9a11t0wcejbo39kv line-delta 35144 219 77 :
-cjwatson@canonical.com-20070907180936-aj8rjtp7b5m3ew60 line-delta 35363 159 78 :
-cjwatson@canonical.com-20070907181306-kvfazizibbewoi1e line-delta 35522 218 79 :
-cjwatson@canonical.com-20070908215512-j8y4rqpw4g4duaat line-delta 35740 295 80 :
-cjwatson@canonical.com-20070908220200-4p1l3rvad4nz59ag line-delta 36035 217 81 :
-cjwatson@canonical.com-20070925113611-20jvhpb5mbgc25ux line-delta 36252 257 82 :
-cjwatson@canonical.com-20070925113702-3c1v808xu8r7dxrz line-delta 36509 217 83 :
-lamont@mib-20070926194801-xpo9hnwvqi53nblb line-delta 36726 285 84 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 line-delta 37011 300 37 :
-doko@salsa-20071003155232-f4n9tdezdkcmn21z fulltext 37311 5041 85 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 line-delta 17942 300 37 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-1 fulltext 18242 2477 43 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-2 line-delta 20719 255 45 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-5 line-delta 20974 301 46 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--version-0 line-delta 21275 236 47 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-1 line-delta 21511 293 48 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-2 line-delta 21804 249 49 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-3 line-delta 22053 255 50 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-4 line-delta 22308 256 51 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-5 line-delta 22564 283 52 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-6 line-delta 22847 250 53 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-7 line-delta 23097 180 54 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-8 fulltext 23277 3033 55 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-9 line-delta 26310 201 56 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-10 line-delta 26511 151 57 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-11 line-delta 26662 201 58 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-12 line-delta 26863 198 59 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-13 line-delta 27061 297 60 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-14 line-delta 27358 206 61 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-15 line-delta 27564 201 62 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-18 line-delta 27765 191 63 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-19 line-delta 27956 247 64 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-20 line-delta 28203 332 65 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-21 line-delta 28535 302 66 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-23 line-delta 28837 207 67 :
+adconrad@cthulhu-20070710101201-n6mhazrg3xo6h043 line-delta 29044 480 68 :
+adconrad@cthulhu-20070710110957-gehhqe29gby0w64n fulltext 29524 3859 69 :
+adconrad@cthulhu-20070710111704-rzdbrd27nejovd3q line-delta 33383 171 70 :
+adconrad@cthulhu-20070711152031-1bnsrdzee9w3vzqp line-delta 33554 275 71 :
+adconrad@cthulhu-20070718094329-l7657ic3yzpm8epj line-delta 33829 268 72 :
+cjwatson@canonical.com-20070721104812-1c5snruqsburbre3 line-delta 34097 355 73 :
+cjwatson@canonical.com-20070721134533-pg5lqdzfq9ovs3m1 line-delta 34452 217 74 :
+adconrad@cthulhu-20070803141049-u72kaejv1hwa2exk line-delta 34669 322 75 :
+adconrad@cthulhu-20070821135804-412oyi4xnwb2rte8 line-delta 34991 241 76 :
+cjwatson@canonical.com-20070907152510-hgild5g5q88dl7gp line-delta 35232 212 77 :
+cjwatson@canonical.com-20070907180808-9a11t0wcejbo39kv line-delta 35444 219 78 :
+cjwatson@canonical.com-20070907180936-aj8rjtp7b5m3ew60 line-delta 35663 159 79 :
+cjwatson@canonical.com-20070907181306-kvfazizibbewoi1e line-delta 35822 218 80 :
+cjwatson@canonical.com-20070908215512-j8y4rqpw4g4duaat line-delta 36040 295 81 :
+cjwatson@canonical.com-20070908220200-4p1l3rvad4nz59ag line-delta 36335 217 82 :
+cjwatson@canonical.com-20070925113611-20jvhpb5mbgc25ux line-delta 36552 257 83 :
+cjwatson@canonical.com-20070925113702-3c1v808xu8r7dxrz line-delta 36809 217 84 :
+lamont@mib-20070926194801-xpo9hnwvqi53nblb line-delta 37026 285 85 :
+doko@salsa-20071003155232-f4n9tdezdkcmn21z fulltext 37311 5041 86 :
 doko@salsa-20071004092543-qzap04qfo6i77h29 line-delta 42352 268 87 :
 doko@salsa-20071004110523-ab0qzrldakrxi9ap line-delta 42620 249 88 :
 cjwatson@canonical.com-20071004132601-q4vup64i8pslbjqf line-delta 42869 342 89 :
-cjwatson@canonical.com-20071004132641-fysek6ezu9658kb8 line-delta 43211 219 90 :
\ No newline at end of file
+cjwatson@canonical.com-20071004132641-fysek6ezu9658kb8 line-delta 43211 219 90 :
+doko@salsa-20071007121443-tsaye6lzm7b0h2dv line-delta 43430 247 91 :
+cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy line-delta 43677 264 92 :
+cjwatson@canonical.com-20071024160911-4egvg829efwoni0v line-delta 43941 153 93 :
+cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb line-delta 44094 175 94 :
+cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x line-delta 44269 216 95 :
\ No newline at end of file
diff --git a/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit b/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit
index 0baaa1b5..19a79c36 100644
Binary files a/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit and b/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit differ
diff --git a/.bzr/repository/knits/5c/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.2.kndx b/.bzr/repository/knits/5c/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.2.kndx
index 45dd069f..7ce8d181 100644
--- a/.bzr/repository/knits/5c/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.2.kndx
+++ b/.bzr/repository/knits/5c/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.2.kndx
@@ -15,4 +15,5 @@ Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--pa
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-21 line-delta 3282 208 11 :
 adconrad@cthulhu-20070710101201-n6mhazrg3xo6h043 line-delta 3490 158 12 :
 cjwatson@canonical.com-20070721104812-1c5snruqsburbre3 fulltext 3648 509 13 :
-doko@salsa-20071003155232-f4n9tdezdkcmn21z line-delta 4157 190 14 :
\ No newline at end of file
+doko@salsa-20071003155232-f4n9tdezdkcmn21z line-delta 4157 190 14 :
+cjwatson@canonical.com-20071024160911-4egvg829efwoni0v line-delta 4347 195 15 :
\ No newline at end of file
diff --git a/.bzr/repository/knits/5c/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.2.knit b/.bzr/repository/knits/5c/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.2.knit
index 8eb56f69..16031955 100644
Binary files a/.bzr/repository/knits/5c/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.2.knit and b/.bzr/repository/knits/5c/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.2.knit differ
diff --git a/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx b/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx
index 51ecfb11..88ca44a5 100644
--- a/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx
+++ b/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx
@@ -51,50 +51,53 @@ Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--pa
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-4 line-delta 37936 205 47 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-5 line-delta 38141 238 48 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-6 line-delta 38379 213 49 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-2 line-delta 38592 273 50 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-3 line-delta 38865 404 51 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-4 line-delta 39269 196 52 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-5 line-delta 39465 190 53 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-6 line-delta 39655 213 54 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-7 line-delta 39868 217 55 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-1 line-delta 40085 236 56 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-2 line-delta 40321 427 57 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-3 line-delta 40748 220 58 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-4 line-delta 40968 265 59 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-5 line-delta 41233 467 60 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-6 line-delta 41700 231 61 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-7 fulltext 41931 5354 62 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-8 line-delta 47285 212 63 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-9 line-delta 47497 200 64 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-10 line-delta 47697 213 65 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-11 line-delta 47910 213 66 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-12 line-delta 48123 263 67 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-13 line-delta 48386 188 68 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-14 line-delta 48574 165 69 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-15 line-delta 48739 365 70 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-16 line-delta 49104 218 71 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-17 line-delta 49322 198 72 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-18 line-delta 49520 213 73 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-19 line-delta 49733 265 74 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-20 line-delta 49998 254 75 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-21 line-delta 50252 303 76 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-22 line-delta 50555 422 77 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-23 line-delta 50977 265 78 :
-adconrad@cthulhu-20070710101201-n6mhazrg3xo6h043 line-delta 51242 1525 79 :
-adconrad@cthulhu-20070710111704-rzdbrd27nejovd3q fulltext 52767 5605 80 :
-adconrad@cthulhu-20070718093833-1td2juzxn1bq8lxb line-delta 58372 194 81 :
-cjwatson@canonical.com-20070721104812-1c5snruqsburbre3 line-delta 58566 338 82 :
-adconrad@cthulhu-20070803141049-u72kaejv1hwa2exk line-delta 58904 822 83 :
-adconrad@cthulhu-20070821135804-412oyi4xnwb2rte8 line-delta 59726 180 84 :
-cjwatson@canonical.com-20070907152510-hgild5g5q88dl7gp line-delta 59906 234 85 :
-cjwatson@canonical.com-20070907180808-9a11t0wcejbo39kv line-delta 60140 279 86 :
-cjwatson@canonical.com-20070907180936-aj8rjtp7b5m3ew60 line-delta 60419 145 87 :
-cjwatson@canonical.com-20070908215512-j8y4rqpw4g4duaat line-delta 60564 591 88 :
-cjwatson@canonical.com-20070908215623-im1lmyr5iz9iebq2 line-delta 61155 220 89 :
-cjwatson@canonical.com-20070925113611-20jvhpb5mbgc25ux line-delta 61375 166 90 :
-lamont@mib-20070926194432-f8un38pb6snfs55t line-delta 61541 221 91 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 line-delta 61762 204 46 :
-doko@salsa-20071003155232-f4n9tdezdkcmn21z line-delta 61966 277 92 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 line-delta 38592 204 46 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-2 line-delta 38796 273 50 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-3 line-delta 39069 404 52 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-4 line-delta 39473 196 53 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-5 line-delta 39669 190 54 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-6 line-delta 39859 213 55 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-7 line-delta 40072 217 56 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-1 line-delta 40289 236 57 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-2 line-delta 40525 427 58 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-3 line-delta 40952 220 59 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-4 line-delta 41172 265 60 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-5 line-delta 41437 467 61 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-6 line-delta 41904 231 62 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-7 fulltext 42135 5354 63 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-8 line-delta 47489 212 64 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-9 line-delta 47701 200 65 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-10 line-delta 47901 213 66 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-11 line-delta 48114 213 67 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-12 line-delta 48327 263 68 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-13 line-delta 48590 188 69 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-14 line-delta 48778 165 70 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-15 line-delta 48943 365 71 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-16 line-delta 49308 218 72 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-17 line-delta 49526 198 73 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-18 line-delta 49724 213 74 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-19 line-delta 49937 265 75 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-20 line-delta 50202 254 76 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-21 line-delta 50456 303 77 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-22 line-delta 50759 422 78 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.27--patch-23 line-delta 51181 265 79 :
+adconrad@cthulhu-20070710101201-n6mhazrg3xo6h043 line-delta 51446 1525 80 :
+adconrad@cthulhu-20070710111704-rzdbrd27nejovd3q fulltext 52971 5605 81 :
+adconrad@cthulhu-20070718093833-1td2juzxn1bq8lxb line-delta 58576 194 82 :
+cjwatson@canonical.com-20070721104812-1c5snruqsburbre3 line-delta 58770 338 83 :
+adconrad@cthulhu-20070803141049-u72kaejv1hwa2exk line-delta 59108 822 84 :
+adconrad@cthulhu-20070821135804-412oyi4xnwb2rte8 line-delta 59930 180 85 :
+cjwatson@canonical.com-20070907152510-hgild5g5q88dl7gp line-delta 60110 234 86 :
+cjwatson@canonical.com-20070907180808-9a11t0wcejbo39kv line-delta 60344 279 87 :
+cjwatson@canonical.com-20070907180936-aj8rjtp7b5m3ew60 line-delta 60623 145 88 :
+cjwatson@canonical.com-20070908215512-j8y4rqpw4g4duaat line-delta 60768 591 89 :
+cjwatson@canonical.com-20070908215623-im1lmyr5iz9iebq2 line-delta 61359 220 90 :
+cjwatson@canonical.com-20070925113611-20jvhpb5mbgc25ux line-delta 61579 166 91 :
+lamont@mib-20070926194432-f8un38pb6snfs55t line-delta 61745 221 92 :
+doko@salsa-20071003155232-f4n9tdezdkcmn21z line-delta 61966 277 93 :
 doko@salsa-20071004092543-qzap04qfo6i77h29 line-delta 62243 376 94 :
 doko@salsa-20071004110523-ab0qzrldakrxi9ap line-delta 62619 284 95 :
-cjwatson@canonical.com-20071004132601-q4vup64i8pslbjqf line-delta 62903 165 96 :
\ No newline at end of file
+cjwatson@canonical.com-20071004132601-q4vup64i8pslbjqf line-delta 62903 165 96 :
+doko@salsa-20071007121443-tsaye6lzm7b0h2dv line-delta 63068 245 97 :
+cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy line-delta 63313 202 98 :
+cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb line-delta 63515 216 99 :
\ No newline at end of file
diff --git a/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit b/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit
index e7f432a3..2f395be6 100644
Binary files a/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit and b/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit differ
diff --git a/.bzr/repository/revisions.kndx b/.bzr/repository/revisions.kndx
index 50024246..4ea5d50e 100644
--- a/.bzr/repository/revisions.kndx
+++ b/.bzr/repository/revisions.kndx
@@ -74,16 +74,16 @@ Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--pa
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-11 fulltext 23212 316 70 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-12 fulltext 23528 329 71 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--base-0 fulltext 23857 324 72 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 fulltext 24181 323 72 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-1 fulltext 24504 318 73 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-2 fulltext 24822 325 75 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-3 fulltext 25147 316 76 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-4 fulltext 25463 404 77 74 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-5 fulltext 25867 348 78 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-6 fulltext 26215 329 79 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-7 fulltext 26544 314 80 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--version-0 fulltext 26858 319 81 :
-Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--base-0 fulltext 27177 326 82 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-1 fulltext 24181 318 73 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-2 fulltext 24499 325 74 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-3 fulltext 24824 316 75 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-4 fulltext 25140 404 76 .Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-5 fulltext 25544 348 77 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-6 fulltext 25892 329 78 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-7 fulltext 26221 314 79 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--version-0 fulltext 26535 319 80 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 fulltext 26854 323 72 :
+Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--base-0 fulltext 27177 326 81 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-1 fulltext 27503 317 83 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-2 fulltext 27820 324 84 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-3 fulltext 28144 353 85 :
@@ -141,4 +141,9 @@ doko@salsa-20071003155232-f4n9tdezdkcmn21z fulltext 46212 452 136 :
 doko@salsa-20071004092543-qzap04qfo6i77h29 fulltext 46664 463 137 :
 doko@salsa-20071004110523-ab0qzrldakrxi9ap fulltext 47127 445 138 :
 cjwatson@canonical.com-20071004132601-q4vup64i8pslbjqf fulltext 47572 474 139 :
-cjwatson@canonical.com-20071004132641-fysek6ezu9658kb8 fulltext 48046 355 140 :
\ No newline at end of file
+cjwatson@canonical.com-20071004132641-fysek6ezu9658kb8 fulltext 48046 355 140 :
+doko@salsa-20071007121443-tsaye6lzm7b0h2dv fulltext 48401 392 141 :
+cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy fulltext 48793 388 142 :
+cjwatson@canonical.com-20071024160911-4egvg829efwoni0v fulltext 49181 367 143 :
+cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb fulltext 49548 373 144 :
+cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x fulltext 49921 355 145 :
\ No newline at end of file
diff --git a/.bzr/repository/revisions.knit b/.bzr/repository/revisions.knit
index 5a34df14..03bdb0b4 100644
Binary files a/.bzr/repository/revisions.knit and b/.bzr/repository/revisions.knit differ
diff --git a/debian/changelog b/debian/changelog
index f6821bf7..7b6f1fea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (0.42) hardy; urgency=low
+
+  * Create /spu directory and spu group for powerpc+ps3 builds.
+  * Add XS-Vcs-Bzr field.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 24 Oct 2007 23:20:58 +0100
+
 livecd-rootfs (0.41) gutsy; urgency=low
 
   * Log the size of doc directories to stdout.
diff --git a/debian/control b/debian/control
index 282ac5a2..1e3ef726 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Build-Depends: debhelper (>=4)
 Maintainer: Adam Conrad <adconrad@ubuntu.com>
 Standards-Version: 3.6.1.0
+XS-Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
 
 Package: livecd-rootfs
 Architecture: all
diff --git a/livecd.sh b/livecd.sh
index 8fd5cf5d..c4b233cb 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -264,6 +264,11 @@ link_in_boot = $link_in_boot
     mkdir -p ${ROOT}proc
     mount -tproc none ${ROOT}proc
 
+    case $ARCH+$SUBARCH in
+	powerpc+ps3)
+	    mkdir -p ${ROOT}spu;;
+    esac
+
     # In addition to the ones we got from apt, trust whatever the local system
     # believes in, but put things back afterwards.
     cp ${ROOT}etc/apt/trusted.gpg ${ROOT}etc/apt/trusted.gpg.$$
@@ -375,6 +380,10 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
 	ln -s livecd.${FSS}.initrd-"${SUBARCH}" livecd.${FSS}.initrd
 	ln -s livecd.${FSS}.kernel-"${SUBARCH}" livecd.${FSS}.kernel
     fi
+    case $ARCH+$SUBARCH in
+	powerpc+ps3)
+	    chroot ${ROOT} addgroup --system spu;;
+    esac
     # all done with the chroot; reset the debconf frontend, so Colin doesn't cry
     echo RESET debconf/frontend | chroot $ROOT debconf-communicate
     echo FSET debconf/frontend seen true | chroot $ROOT debconf-communicate