Merge commit 'origin/sbs-for-master'

diff --cc debian/changelog
index b62a717,eb9ab48..8589165
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ glib2.0 (2.24.0-3slp2+1) unstable; urgency=low
+ 
+   * Change dh_makeshlibs parameters: 
+     + drop -c4 passed to the dpkg-gensymbols
+     + pass -v2.24.0 (to avoid 'slp2' suffix)
+ 
+  -- Tomasz Fujak <t.fujak@samsung.com>  Sun, 05 Sep 2010 11:44:53 +0900
+ 
 +glib2.0 (2.24.2-1slp2) unstable; urgency=low
 +
 +  * Update glib2.0 to 2.24.2
 +
 + -- Boram Park <boram1288.park@samsung.com>  Mon, 13 Sep 2010 11:04:39 +0900
 +
  glib2.0 (2.24.0-3slp2) unstable; urgency=low
  
    * Remove udeb from debian/control file

diff --cc debian/rules
Simple merge