Merge branch 'master' of ssh://200.18.67.61:4731/home/git/simdecs2.git
authormaroni <maroni@192.168.1.112>
Tue, 13 Mar 2012 18:14:24 +0000 (15:14 -0300)
committermaroni <maroni@192.168.1.112>
Tue, 13 Mar 2012 18:14:24 +0000 (15:14 -0300)

Trivial merge