Merge branch 'master' into genete_core_review
authorCarlos Lopez <genetita@gmail.com>
Sun, 13 Jun 2010 19:34:23 +0000 (21:34 +0200)
committerCarlos Lopez <genetita@gmail.com>
Sun, 13 Jun 2010 19:34:23 +0000 (21:34 +0200)

Trivial merge