merge of '2ae6ecf2677fa2b9a53f45b824b830304af50db8'

     and 'ef1738131018813b36ed568f7299f38f6f22f3a2'

diff --cc conf/machine/htcuniversal.conf
index 0af0a55,7c0710d..58fb5c7
--- 1/conf/machine/htcuniversal.conf
--- 2/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@@ -15,15 -15,15 +15,15 @@@ MACHINE_FEATURES = "kernel26 apm alsa i
  MODUTILS = "26"       
  
  MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
- MACHINE_EXTRA_RRECOMMENDS = "  kernel-module-nls_cp437 \
 -MACHINE_EXTRA_RRECOMMENDS = "  kernel-module-nls-cp437 \
 -                                kernel-module-nls-iso8859-1 \
 -                                kernel-module-nls-utf8 \
 -                                kernel-module-af-key \
 -                              kernel-module-bsd-comp \
++MACHINE_EXTRA__RRECOMMENDS = "  kernel-module-nls_cp437 \
 +                                kernel-module-nls_iso8859-1 \
 +                                kernel-module-nls_utf8 \
 +                                kernel-module-af_key \
 +                              kernel-module-bsd_comp \
                                kernel-module-i2c-pxa \
 -                              kernel-module-htcuniversal-power \
 -                              kernel-module-snd-htcuniversal-audio \
 -                              kernel-module-htcuniversal-acx \
 +                              kernel-module-htcuniversal_power \
 +                              kernel-module-snd-htcuniversal_audio \
 +                              kernel-module-htcuniversal_acx \
                                kernel-module-acx \
                                "