Merge lp:~didrocks/software-center/zoho-featured-app into lp:software-center

[Didier Roche-Tolomelli]

Just propose zoho integration used in armel UNE by default as a featured app as per https://blueprints.launchpad.net/ubuntu/+spec/desktop-maverick-une-app-selection

[lp:~didrocks/software-center/zoho-featured-app]

1000. By Michael Vogt on 2010-08-11

this commit is dedicated to all the people who contributed to software-center, thanks everybody!

1001. By Michael Vogt on 2010-08-11

* data/featured.menu.in:
  - add zoho integration as a featured app

=== modified file 'data/featured.menu.in'
--- data/featured.menu.in	2010-03-26 19:49:00 +0000
+++ data/featured.menu.in	2010-08-11 08:32:44 +0000
@@ -25,6 +25,7 @@
 	<SCPkgname>supertuxcart</SCPkgname>
 	<SCPkgname>tumiki-fighters</SCPkgname>
 	<SCPkgname>tuxpaint</SCPkgname>
+	<SCPkgname>webservice-office-zoho</SCPkgname>
       </Or>
     </Include>
   </Menu>

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-09 14:18:16 +0000
+++ debian/changelog	2010-08-11 08:32:44 +0000
@@ -22,6 +22,10 @@
     - add support for the inline icon_data, push them into 
       SOFTWARE_CENTER_ICON_CACHE_DIR, add tests
 
+  [ Didier Roche ]
+  * data/featured.menu.in:
+    - add zoho integration as a featured app
+
  -- Michael Vogt <[e-mail]>  Mon, 09 Aug 2010 10:27:20 +0200
 
 software-center (2.1.8) maverick; urgency=low