Merge branch 'froyo' of http://github.com/CyanogenMod/android_packages_apps_Settings into froyo

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

                <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />

                <action android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" />

                <action android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" />

                <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />

                <action android:name="com.android.internal.telephony.NETWORK_MODE_CHANGED" />