Double-amputee Oscar Pistorius made Olympic history today, qualifying for the semi-finals in the 400m in a time of 45.04.

Pistorius didn't quite know what to feel after finishing second in his heat.

"I didn't know if I should cry or be happy. It was such a mix of emotions."

Failing to qualify out of prelims was defending gold-medalist in the 400m LaShawn Merritt, who pulled up lame 250 meters into his heat. Merritt failed a drug test back in 2009 for a masking agent found in the convenience store male-enhancement drug, ExtenZe.