Merged Latest.
authorTejas Tank <tta@openerp.com>
Thu, 22 Nov 2012 11:02:25 +0000 (16:32 +0530)
committerTejas Tank <tta@openerp.com>
Thu, 22 Nov 2012 11:02:25 +0000 (16:32 +0530)
bzr revid: tta@openerp.com-20121122110225-xb5vv67c6rw1dr90

1  2 
addons/survey/survey_view.xml

Simple merge