[MERGE]: Merged with parent branch

bzr revid: uco@tinyerp.co.in-20100118134754-6rhoc8oocxn3clnz

diff --cc addons/crm/crm_meeting.py
Simple merge

diff --cc addons/project/project.py
Simple merge

diff --cc addons/project/project_view.xml
index 18989fb,a619d16..8e65584
--- 1/addons/project/project_view.xml
--- 2/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@@ -485,9 -479,11 +486,12 @@@
                          <filter string="Draft" domain="[('state','=','draft')]" help="Draft Tasks" icon="terp-project"/>
                          <filter string="Open" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
                          <filter string="Pending" domain="[('state','=','pending')]" help="Pending Tasks" icon="terp-project"/>
+                         <filter string="By Users" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
+                         <filter string="By Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
+                                               <filter string="By Type" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
                          <separator orientation="vertical"/>
                          <field name="name" select="1"/>
 +                        <field name="type" select="1" widget="selection"/>
                          <field name="project_id" select="1" widget="selection">
                               <filter domain="[('manager_id','=',False)]" help="Unassigned Project" icon="terp-project"/>
                          </field>