Merge branch 'devel' into merge merge
authorThadeu Lima de Souza Cascardo <cascardo@cascardo.eti.br>
Tue, 2 Sep 2014 08:49:47 +0000 (05:49 -0300)
committerThadeu Lima de Souza Cascardo <cascardo@cascardo.eti.br>
Tue, 2 Sep 2014 08:49:47 +0000 (05:49 -0300)

Trivial merge