Updates against mainline OE

git-svn-id: https://svn.o-hand.com/repos/poky@26 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 2 insertions, 2 deletions

diff --git a/openembedded/packages/base-files/base-files/ipaq-pxa270/fstab b/openembedded/packages/base-files/base-files/ipaq-pxa270/fstab
index 8c38a5fda2..3dfde917e6 100644
--- a/openembedded/packages/base-files/base-files/ipaq-pxa270/fstab
+++ b/openembedded/packages/base-files/base-files/ipaq-pxa270/fstab
@@ -4,6 +4,6 @@
 proc            /proc           proc    defaults        0  0
 sys             /sys        sysfs       defaults        0  0
 
-/dev/hda1               /media/cf       auto    defaults,noauto,noatime,user,exec,suid  0  0
+/dev/hda1               /media/cf       auto    defaults,noauto,noatime,exec,suid       0  0
 tmpfs                   /var            tmpfs   defaults        0  0
 tmpfs                   /media/ram      tmpfs   defaults        0  0
diff --git a/openembedded/packages/base-files/base-files_3.0.14.bb b/openembedded/packages/base-files/base-files_3.0.14.bb
index e2c1003c58..d63c38ab83 100644
--- a/openembedded/packages/base-files/base-files_3.0.14.bb
+++ b/openembedded/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r40"
+PR = "r41"
 LICENSE = "GPL"
 
 SRC_URI = " \