hal: Branch 'master'

[Martin Pitt]

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

New commits:
commit 148db02863eb6d56bb45ebff4a448c2a530d0ad2
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Mon Aug 24 14:47:52 2009 +0200

    permit 'locale' NTFS mount option
    
    Allow users to specify th NTFS "locale" mount option (for ntfs-3g), which is
    required by KDE, and also useful for GNOME.
    
    https://launchpad.net/bugs/78370
    https://launchpad.net/bugs/395079

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index 462a2a8..cd9544e 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -245,6 +245,7 @@
 	  <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">