Merge branch 'genete_master'
authorCarlos Lopez <genetita@gmail.com>
Sun, 24 Jan 2010 11:03:59 +0000 (12:03 +0100)
committerCarlos Lopez <genetita@gmail.com>
Sun, 24 Jan 2010 11:03:59 +0000 (12:03 +0100)

Trivial merge