Merge branch 'master' into genete_master
authorCarlos Lopez <genetita@gmail.com>
Tue, 20 Oct 2009 20:21:49 +0000 (22:21 +0200)
committerCarlos Lopez <genetita@gmail.com>
Tue, 20 Oct 2009 20:21:49 +0000 (22:21 +0200)

Trivial merge