I just realized a nice feature of terminal.app. If you have two windows open and want one window with two tabs, just press [CMD]+[SHIFT]+t to make the tab-bar show up, then drag the tab to another window. Et voila, you get one window with two tabs.