Re-analysis of the RXTE and RHESSI data of the 2004 Giant Flare observed from SGR 1806-20