resolved conflicts for merge of e304b9f4 to eclair-mr2

diff --cc src/com/android/settings/wifi/WifiSettings.java
index abb2408,81e6a05..3bd76f6
--- 1/src/com/android/settings/wifi/WifiSettings.java
--- 2/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@@ -261,9 -276,9 +276,8 @@@ public class WifiSettings extends Prefe
          if (state == null) {
              return;
          }
-      
-         menu.setHeaderTitle(state.ssid);
-         
 -
+         menu.setHeaderTitle(state.getHumanReadableSsid());
+ 
          if (state.isConnectable()) {
              menu.add(0, CONTEXT_MENU_ID_CONNECT, 0, R.string.wifi_context_menu_connect);
          }