Merge branch 'zelgadis_master'
authorCarlos Lopez <genetita@gmail.com>
Wed, 14 Apr 2010 17:14:28 +0000 (19:14 +0200)
committerCarlos Lopez <genetita@gmail.com>
Wed, 14 Apr 2010 17:14:28 +0000 (19:14 +0200)

Trivial merge