Another set of fixes for the bad merge at r16679.
For some reason the branch changes to the generic_fns.align_tensor module had been reverted in the merger.
Authored by: bugman 2012-06-06
Parent: [r16710]
Child: [r16712]
