udpdated to rails 3-2-stable