diff -Nru sugar-0.88-0.88.1/debian/changelog sugar-0.88-0.88.1/debian/changelog
--- sugar-0.88-0.88.1/debian/changelog	2010-07-24 21:17:20.000000000 +0530
+++ sugar-0.88-0.88.1/debian/changelog	2010-08-31 00:26:14.000000000 +0530
@@ -1,3 +1,9 @@
+sugar-0.88 (0.88.1-2ubuntu2) maverick; urgency=low
+
+  * Set column size in control panel according to screen width. (LP: #617582) 
+
+ -- Neeraj Gupta <neeraj@seeta.in>  Tue, 31 Aug 2010 00:23:30 +0530
+
 sugar-0.88 (0.88.1-2ubuntu1) maverick; urgency=low
 
   * Merge from debian unstable(LP: #609412). Remaining changes:
diff -Nru sugar-0.88-0.88.1/debian/patches/control_panel_column_size.patch sugar-0.88-0.88.1/debian/patches/control_panel_column_size.patch
--- sugar-0.88-0.88.1/debian/patches/control_panel_column_size.patch	1970-01-01 05:30:00.000000000 +0530
+++ sugar-0.88-0.88.1/debian/patches/control_panel_column_size.patch	2010-08-31 00:29:38.000000000 +0530
@@ -0,0 +1,21 @@
+From: Neeraj Gupta <neeraj@seeta.in>
+Subject: Set the _MAX_COLUMN value according to screen witdh, in control panel display.
+
+Only applied as patch to avoid icon cut-off problem when running emulator in reduced resolution.
+
+Forwarded: no
+Last-Update: 2010-08-31
+
+Index: sugar-0.88-0.88.1/src/jarabe/controlpanel/gui.py
+===================================================================
+--- sugar-0.88-0.88.1.orig/src/jarabe/controlpanel/gui.py	2010-08-31 00:17:47.335004001 +0530
++++ sugar-0.88-0.88.1/src/jarabe/controlpanel/gui.py	2010-08-31 00:21:19.507004019 +0530
+@@ -33,7 +33,7 @@
+ from jarabe import config
+ 
+ _logger = logging.getLogger('ControlPanel')
+-_MAX_COLUMNS = 5
++_MAX_COLUMNS = (gtk.gdk.screen_width())/(3*style.GRID_CELL_SIZE)
+ 
+ class ControlPanel(gtk.Window):
+     __gtype_name__ = 'SugarControlPanel'
diff -Nru sugar-0.88-0.88.1/debian/patches/series sugar-0.88-0.88.1/debian/patches/series
--- sugar-0.88-0.88.1/debian/patches/series	2010-07-20 16:05:12.000000000 +0530
+++ sugar-0.88-0.88.1/debian/patches/series	2010-08-31 00:14:47.000000000 +0530
@@ -3,3 +3,4 @@
 #fix_tz_config_path.patch
 #danish_l10n_autotools.patch
 empy_from_system_autotools.patch
+control_panel_column_size.patch