Alignment of the Pixel and SCT Modules for the 2004 ATLAS Combined Test Beam