Merge branch 'master' into genete_core_review
authorCarlos Lopez <genetita@gmail.com>
Wed, 30 Jun 2010 16:46:13 +0000 (18:46 +0200)
committerCarlos Lopez <genetita@gmail.com>
Wed, 30 Jun 2010 16:46:13 +0000 (18:46 +0200)

Trivial merge