[MERGE] hr_holidays: Demo data added
authormra (Open ERP) <mra@tinyerp.com>
Fri, 21 May 2010 07:58:26 +0000 (13:28 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Fri, 21 May 2010 07:58:26 +0000 (13:28 +0530)
scrum: Demo data for hour
hr_timesheet_invoice: Correct search view (MERGE PSI Branch)

bzr revid: mra@tinyerp.com-20100521075826-enc7m8dnd13hkc8o


Trivial merge