Merge branch 'zelgadis_master'
authorCarlos Lopez <genetita@gmail.com>
Mon, 31 Aug 2009 16:05:15 +0000 (18:05 +0200)
committerCarlos Lopez <genetita@gmail.com>
Mon, 31 Aug 2009 16:05:15 +0000 (18:05 +0200)

Trivial merge