Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver

Conflicts:
	xscreensaver/debian/changelog

diff --cc xscreensaver/debian/changelog
index d007235,50b5c54..c2bc34f
--- 1/xscreensaver/debian/changelog
--- 2/xscreensaver/debian/changelog
+++ b/xscreensaver/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 -xscreensaver (5.11-1+maemor8) stable-proposed-updates; urgency=low
++xscreensaver (5.11-1+maemo9) stable-proposed-updates; urgency=low
+ 
 -  *  Increased number supported of views to 9
++  * Increased number supported of views to 9
+ 
+  -- Vlad Vasiliev <vlad@gas.by>  Sat, 02 Oct 2010 08:43:57 +0200
+ 
 +xscreensaver (5.11-1+maemo8) stable-proposed-updates; urgency=low
 +
 +  * Full optification 
 +
 + -- Vlad Vasiliev <vlad@gas.by>  Wed, 25 Aug 2010 18:14:57 +0200
 +
  xscreensaver (5.11-1+maemo7) stable-proposed-updates; urgency=low
  
    *  Changed Description in package