Merge branch 'master' of ssh://dio.dreamhost.com/~/repos.nelsonferreira.com/git/sxema...
authorNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 11 Jan 2012 00:27:51 +0000 (19:27 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 11 Jan 2012 00:27:51 +0000 (19:27 -0500)

Trivial merge