hal: Branch 'master'

[Martin Pitt]

 fdi/policy/10osvendor/20-storage-methods.fdi |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 3c81d86716dd18ef47bc1ea1f834d88083ac3231
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Mon Aug 24 14:53:58 2009 +0200

    Revert "permit 'locale' NTFS mount option"
    
    This reverts commit 148db02863eb6d56bb45ebff4a448c2a530d0ad2.
    
    There's a better mechanism for this now (alternative mount options).

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index cd9544e..462a2a8 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -245,7 +245,6 @@
 	  <append key="volume.mount.valid_options" type="strlist">uid=</append>
 	  <append key="volume.mount.valid_options" type="strlist">gid=</append>
 	  <append key="volume.mount.valid_options" type="strlist">umask=</append>
-	  <append key="volume.mount.valid_options" type="strlist">locale=</append>
 	  <append key="volume.mount.valid_options" type="strlist">utf8</append>
 	</match>
 	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">