diff --git a/ChangeLog b/ChangeLog
index 174dd044ed64cbcb8a07502ce23feca4b1817da9_Q2hhbmdlTG9n..94259dfefe0e2f47665df4e10af15f12bebc3037_Q2hhbmdlTG9n 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ChangeLog for RQL
 =================
 
- --
+2009-05-04  --  0.22.0
     * consider subqueries in variables graph
@@ -5,2 +5,3 @@
     * consider subqueries in variables graph
+
     * py datetime support (must be explicitly activated until we drop mx.DateTime support)
@@ -6,2 +7,3 @@
     * py datetime support (must be explicitly activated until we drop mx.DateTime support)
+
     * implements main_relation on ColumnAlias
@@ -7,5 +9,7 @@
     * implements main_relation on ColumnAlias
-	
-2009-02-17 -- 0.21.0
+
+
+
+2009-02-17  --  0.21.0
     * new type solver based on gecode
 
@@ -10,6 +14,7 @@
     * new type solver based on gecode
 
-	
+
+
 2008-10-17  --  0.20.2
     * new remove_subquery method on Select node
 
@@ -247,7 +252,7 @@
 
 2007-02-09  --  0.10.1
     * fix rewriting bug: variable used in an optional relation can't be
-      rewritten 
+      rewritten
 
     * new 'main_relation' method on variable
 
@@ -342,7 +347,7 @@
       full deep copy
 
     * support for substitute on uid relation in the type analyzer
-      (this implies to give the kwargs dictionary of the query to the 
+      (this implies to give the kwargs dictionary of the query to the
       analyzer)
 
 
diff --git a/__pkginfo__.py b/__pkginfo__.py
index 174dd044ed64cbcb8a07502ce23feca4b1817da9_X19wa2dpbmZvX18ucHk=..94259dfefe0e2f47665df4e10af15f12bebc3037_X19wa2dpbmZvX18ucHk= 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -1,10 +1,10 @@
 # pylint: disable-msg=W0622
 """RQL packaging information.
 
-:copyright: 2003-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2003-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 :license: General Public License version 2 - http://www.gnu.org/licenses
 """
 __docformat__ = "restructuredtext en"
 
 modname = "rql"
@@ -5,10 +5,10 @@
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 :license: General Public License version 2 - http://www.gnu.org/licenses
 """
 __docformat__ = "restructuredtext en"
 
 modname = "rql"
-numversion = (0, 21, 0)
+numversion = (0, 22, 0)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LCL'
@@ -12,7 +12,7 @@
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LCL'
-copyright = '''Copyright (c) 2003-2008 LOGILAB S.A. (Paris, FRANCE).
+copyright = '''Copyright (c) 2003-2009 LOGILAB S.A. (Paris, FRANCE).
 http://www.logilab.fr/ -- mailto:contact@logilab.fr'''
 
 author = "Sylvain Thenault"
diff --git a/base.py b/base.py
index 174dd044ed64cbcb8a07502ce23feca4b1817da9_YmFzZS5weQ==..94259dfefe0e2f47665df4e10af15f12bebc3037_YmFzZS5weQ== 100644
--- a/base.py
+++ b/base.py
@@ -2,7 +2,7 @@
 
 Note: this module uses __slots__ to limit memory usage.
       
-:copyright: 2003-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2003-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 :license: General Public License version 2 - http://www.gnu.org/licenses
 """
diff --git a/debian/changelog b/debian/changelog
index 174dd044ed64cbcb8a07502ce23feca4b1817da9_ZGViaWFuL2NoYW5nZWxvZw==..94259dfefe0e2f47665df4e10af15f12bebc3037_ZGViaWFuL2NoYW5nZWxvZw== 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rql (0.22.0-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Mon, 04 May 2009 11:26:55 +0200
+
 rql (0.21.0-2) unstable; urgency=low
 
   * [unstable] change libgecode dependency
diff --git a/nodes.py b/nodes.py
index 174dd044ed64cbcb8a07502ce23feca4b1817da9_bm9kZXMucHk=..94259dfefe0e2f47665df4e10af15f12bebc3037_bm9kZXMucHk= 100644
--- a/nodes.py
+++ b/nodes.py
@@ -356,7 +356,7 @@
 class Relation(Node):
     """a RQL relation"""
     __slots__ = ('r_type', 'optional',
-                 '_q_sqltable', '_q_needcast') # XXX ginco specific
+                 '_q_sqltable', '_q_needcast') # XXX cubicweb specific
     
     def __init__(self, r_type, optional=None):
         Node.__init__(self)