Merge branch 'zelgadis_master'
authorCarlos Lopez <genetita@gmail.com>
Sat, 23 Jan 2010 09:43:02 +0000 (10:43 +0100)
committerCarlos Lopez <genetita@gmail.com>
Sat, 23 Jan 2010 09:43:02 +0000 (10:43 +0100)

Trivial merge