Merge branch 'zelgadis_master'
authorCarlos Lopez <genetita@gmail.com>
Sat, 15 May 2010 21:24:50 +0000 (23:24 +0200)
committerCarlos Lopez <genetita@gmail.com>
Sat, 15 May 2010 21:24:50 +0000 (23:24 +0200)

Trivial merge