Merge branch 'master' into genete_master
authorCarlos Lopez <genetita@gmail.com>
Sun, 9 May 2010 19:06:27 +0000 (21:06 +0200)
committerCarlos Lopez <genetita@gmail.com>
Sun, 9 May 2010 19:06:27 +0000 (21:06 +0200)

Trivial merge