If you want to cover all the bases, then do ALL of the following:
A) 301 redirects, as granular as possible (e.g. Page1 on old site should be 301d to equivalent Page1 on new site, Page2 to Page2 etc.)
B) Google Webmaster tools change of address
C) rel="canonical" tags on the pages in their new location, referencing that new location