diff -Nru casper-1.308/debian/changelog casper-1.309/debian/changelog
--- casper-1.308/debian/changelog	2012-03-13 10:33:27.000000000 +0000
+++ casper-1.309/debian/changelog	2012-03-13 21:18:17.000000000 +0000
@@ -1,3 +1,16 @@
+casper (1.309) precise; urgency=low
+
+  * scripts/casper-bottom/14locales:
+    - Stop dealing with /etc/environment
+    - Always overwrite /etc/default/locale at boot time
+    - Use /root/rofs/etc/default/locale as the base locale (LP: #951397)
+  * scripts/casper-bottom/19keyboard
+    - Reset /etc/default/keyboard if present in the overlay (LP: #953999)
+  * scripts/casper-bottom/50ubiquity-bluetooth-agent
+    - Only do the diversion the first time around
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Tue, 13 Mar 2012 17:00:58 -0400
+
 casper (1.308) precise; urgency=low
 
   * Reconfigure jackd2 if jackd/tweak_rt_limits has been preseeded
diff -Nru casper-1.308/scripts/casper-bottom/14locales casper-1.309/scripts/casper-bottom/14locales
--- casper-1.308/scripts/casper-bottom/14locales	2010-01-05 16:52:10.000000000 +0000
+++ casper-1.309/scripts/casper-bottom/14locales	2012-03-13 21:07:08.000000000 +0000
@@ -20,15 +20,9 @@
 
 log_begin_msg "$DESCRIPTION"
 
-if [ -e /root/etc/default/locale ]; then
-    grep_file=/root/etc/default/locale
-elif [ -e /root/etc/environment ]; then # Old locales policy
-    grep_file=/root/etc/environment
-fi
-
-if [ -n "${grep_file}" ]; then
+if [ -f /root/rofs/etc/default/locale ]; then
     # use rootfs configured locale
-    locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
+    locale=$(grep -s 'LANG=' /root/rofs/etc/default/locale | sed s/'LANG='// | tr -d '"' )
 fi
 
 # commandline
@@ -58,8 +52,7 @@
 
 if [ "${set_locale}" ]; then
     LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
-    printf 'LANG="%s"\n' "${LANG}" >> /root/etc/default/locale
-    printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment
+    printf 'LANG="%s"\n' "${LANG}" > /root/etc/default/locale
     printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
     chroot /root /usr/sbin/locale-gen "${LANG}"
 fi
diff -Nru casper-1.308/scripts/casper-bottom/19keyboard casper-1.309/scripts/casper-bottom/19keyboard
--- casper-1.308/scripts/casper-bottom/19keyboard	2010-12-21 15:28:47.000000000 +0000
+++ casper-1.309/scripts/casper-bottom/19keyboard	2012-03-13 20:59:20.000000000 +0000
@@ -178,6 +178,13 @@
         PREFIX=console-setup
         CONFIGFILE=/etc/default/console-setup
 fi
+
+# Reset the config for persistent medias
+if [ -f /cow$CONFIGFILE ]; then
+    echo "Resetting $CONFIGFILE"
+    cp /root/rofs$CONFIGFILE /root$CONFIGFILE
+fi
+
 if [ -x /root/bin/setupcon ] && [ "$PREFIX" ] && [ "$CONFIGFILE" ]; then
         if [ "$cslayout" ]; then
                 csoptions=
diff -Nru casper-1.308/scripts/casper-bottom/50ubiquity-bluetooth-agent casper-1.309/scripts/casper-bottom/50ubiquity-bluetooth-agent
--- casper-1.308/scripts/casper-bottom/50ubiquity-bluetooth-agent	2012-03-13 10:08:13.000000000 +0000
+++ casper-1.309/scripts/casper-bottom/50ubiquity-bluetooth-agent	2012-03-13 20:22:59.000000000 +0000
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-if [ -f /root/usr/bin/ubiquity-bluetooth-agent ] && [ -f /root/usr/bin/bluetooth-applet ]; then
+if [ -f /root/usr/bin/ubiquity-bluetooth-agent ] &&
+   [ -f /root/usr/bin/bluetooth-applet ] &&
+   [ ! -L /root/usr/bin/bluetooth-applet ]; then
     chroot /root dpkg-divert --package casper --divert /usr/bin/bluetooth-applet.orig --rename /usr/bin/bluetooth-applet
     ln -s ubiquity-bluetooth-agent /root/usr/bin/bluetooth-applet
 fi