Merge branch 'genete_master'
authorCarlos Lopez <carlos@pcnuevo.(none)>
Fri, 19 Jun 2009 15:16:24 +0000 (17:16 +0200)
committerCarlos Lopez <carlos@pcnuevo.(none)>
Fri, 19 Jun 2009 15:16:24 +0000 (17:16 +0200)
commit3ff4f5ed21761e28999d5e355c3fafe95cfd081b
tree7cedc469f5bdf85501bb1ac34848e942f556e931
parentf8df1636f328f694a2b9c511e6c750ee57162dbe
parent35faf1afc5a4a015bfe70be49d528b8a3ea4b0d5
Merge branch 'genete_master'