Merge branch 'zelgadis_master'
authorCarlos Lopez <genetita@gmail.com>
Wed, 12 May 2010 15:11:01 +0000 (17:11 +0200)
committerCarlos Lopez <genetita@gmail.com>
Wed, 12 May 2010 15:11:01 +0000 (17:11 +0200)

Trivial merge