Today
merge from gingerbread_wallpaper_fix