Merge remote-tracking branch 'chiiph/bug/add_osx_temp_dir' into develop
authorIvan Alejandro <ivanalejandro0@yahoo.com.ar>
Fri, 5 Jul 2013 19:14:46 +0000 (16:14 -0300)
committerIvan Alejandro <ivanalejandro0@yahoo.com.ar>
Fri, 5 Jul 2013 19:14:46 +0000 (16:14 -0300)

Trivial merge