Merge branch 'jvlima/master'
commit6eba079f7f0520db21d82795534502f152737269
authorJoao Lima <jvlima@jvlima-desktop.(none)>
Thu, 22 Jul 2010 00:00:47 +0000 (21 21:00 -0300)
committerJoao Lima <jvlima@jvlima-desktop.(none)>
Thu, 22 Jul 2010 00:00:47 +0000 (21 21:00 -0300)
tree24f989362d48f6c891673e77094a216b2aa40e56
parent2b9ab1a58d650372412718db8c4694040413b5f1
parent0d0c1c3049ca87462289c9a6164732cdbf975b1b
Merge branch 'jvlima/master'