First: read this
The law will require that the military take custody of terrorism suspects but safeguards the president's ability to prosecute detainees in the civilian justice system.
US citizens would be exempt from this provision, and affirms that the changes would not affect US law enforcement agencies.
You can download a PDF of the bill and look through it for yourself.
Of particular interest are Section 1031 on page 438, Section 1039 on page 456
-- is not a citizen of the United States or a member of the Armed Forces of the United States
Hope this clears up the bs that has been floating around here...