From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Date: Fri, 7 Nov 2008 21:46:52 +0000 (-0200)
Subject: Merge branch 'master' into mybranch
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fema.git;a=commitdiff_plain;h=89ac8daa7f099aef26e364f7137c5577c6758443;hp=89ac8daa7f099aef26e364f7137c5577c6758443

Merge branch 'master' into mybranch
---