Merge branch 'zelgadis_master' into genete_master
authorCarlos Lopez <carlos@pcnuevo.(none)>
Mon, 27 Jul 2009 15:04:09 +0000 (17:04 +0200)
committerCarlos Lopez <carlos@pcnuevo.(none)>
Mon, 27 Jul 2009 15:04:09 +0000 (17:04 +0200)

Trivial merge