commit 1ab2a0d4d600a04b5f10edabf1c3fb0e14659a6f Merge: 1c60825 93a6c87 Author: Filipe Rosset <rosset.filipe at gmail.com> Date: Fri Aug 6 00:31:32 2010 -0300 Merge branch 'master' into f14 ---