Merge branch 'master' into genete_smart_link
authorCarlos Lopez <genetita@gmail.com>
Sat, 11 Sep 2010 12:42:03 +0000 (14:42 +0200)
committerCarlos Lopez <genetita@gmail.com>
Sat, 11 Sep 2010 12:42:03 +0000 (14:42 +0200)

Trivial merge