# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ls@numerigraphe.fr-20100212085244-5df8mtjae9s7ptu4
# target_branch: bzr+ssh://bazaar.launchpad.net/~openerp/openobject-\
#   server/trunk/
# testament_sha1: cd5dce468cfd81254d424b2ff7a407b8de454078
# timestamp: 2010-02-12 09:53:24 +0100
# base_revision_id: nch@tinyerp.com-20100210124043-zutb1ew0cnth1pai
# 
# Begin patch
=== modified file 'bin/addons/base/module/module.py'
--- bin/addons/base/module/module.py	2010-02-04 13:06:43 +0000
+++ bin/addons/base/module/module.py	2010-02-12 08:52:44 +0000
@@ -167,11 +167,11 @@
         ], string='State', readonly=True),
         'demo': fields.boolean('Demo data'),
         'license': fields.selection([
-                ('GPL-2', 'GPL-2'),
-                ('GPL-2 or any later version', 'GPL-2 or later version'),
-                ('GPL-3', 'GPL-3'),
-                ('GPL-3 or any later version', 'GPL-3 or later version'),
-                ('Other proprietary', 'Other proprietary')
+                ('GPL-2', 'GPL version 2'),
+                ('GPL-3', 'GPL  version 3 or any later version'),
+                ('AGPL-3', 'Affero GPL  version 3 or any later version'),
+                ('Other free', 'Other free software license')
+                ('Other proprietary', 'Other proprietary license')
             ], string='License', readonly=True),
         'menus_by_module': fields.function(_get_views, method=True, string='Menus', type='text', multi="meta", store=True),
         'reports_by_module': fields.function(_get_views, method=True, string='Reports', type='text', multi="meta", store=True),

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb4IwN4AAa1fgAAUUOf/93Kn
yAq//9/wUAPevb3u7XHePe3ZXVYSijTSmamzQnqGpsp6QaaY1AyHpMmgElCTMkeEU0DIZPSZAAAA
ASgkyMjUmnlA0AAAAAABIpAmamppmhNpPSGIBoBoA0ASSTCAATTKanpP0oDIABp6gDDUn+1uJDGz
JiWJk7hWB7ZUzcanzRvBDkdCtFdOPscoq/O44sjFlUc1FhbD9P6r5mEvHh+sT4gO5W7scFg2NjGS
sqzEphsq0QxnONiqMczrISUaopjbelENR2suiZE1/4DAThi4TW8+tl4Yy/IYAV0SmhnATbrKINkI
MHNMQ9YQWSXwaBx6CxV5CQnvEkkmT8UsbmyRw1CILRUs5gT11tdQcK+ChsG0bFvaMMq3o4d9TbLo
zF7IQMXyrbliz19KRJGkTUGKEWoiktkwD9szgbE8inFwbQpOaYx7IYGBALqNL0+djaBxYhG4ySz/
ZtbQ2TIivbNTkq32EnpOVcB4pEVuldmYKg4UWZtoSCJoPdhfYT2wAtqquwLJyZ3dRhcLtLXipbEw
eNHHIi3yLxb8YjFDPjgk4kX0oO2rgt2iZEstsrRgdNSf30CTdYmeQqVKF5uKOJV8dOFs8zZXQYTF
ytRssz3CzHEqsYYrZR2JzWx6uKDKnO5SgJ6HHtM2u/VdhkZx99uZKzSo9BTW0zbCSXbAa8uKIy/X
EF6JwiY2nC9QdNCVWQhRmy2ZLf6a6W00iaJ8ANTbTSx6KBPtjQiPQ0i/epiO2Y3GrOivgTvCMbCZ
CqeryypYZggiXWnmEuJuwxTVuJ7pzFhoJEdokRgy6xTucRvgLgLPRR1cWnLUwZUlUY5v65tp+TLX
qjhW68IwN3QnC3TkbxyWL9Y64t8MiVEW7OritVn9TK1GBLOCp4D94YEK6YhSQHpgRmOUt0TCU9Ge
0r30JMe3Kzboa08yUFyyRRSBZlTDhC0CeVEUziz6097F+p1qUDUYDNTGFvlCzrwvmkEUHg7cN+6G
WURaDsw4IiEXBece9mZy0uf4HqGxyp5BqqJwI1GUaa5RWsVE6bDItkCiihOcMsxC7+rlsRwJqdr8
SgqRhzxMTjOiCDvYgF8mOQOW7lNZAKZvOsnMpiFgD6OMVY3KLBqvT2BEU01d7slYbOwB+JMRk0RK
d7xwFKbJ71MIe9pxjp7xbpQ2lBVniarTVGwOgtlLR6NWBdFjNBOwknYjHaUer/4K23SNIbeYUwoC
EXLOItbRZp3+ilKizmnrBGYQTLKrXZ6uqoHgagF+UmuV5f4u5IpwoSF8EYG8