Merge branch 'genete_smart_link_master'
authorCarlos Lopez <genetita@gmail.com>
Fri, 17 Sep 2010 16:19:29 +0000 (18:19 +0200)
committerCarlos Lopez <genetita@gmail.com>
Fri, 17 Sep 2010 16:19:29 +0000 (18:19 +0200)

Trivial merge