Merge branch 'genete_master'
authorCarlos Lopez <carlos@pcnuevo.(none)>
Sat, 1 Aug 2009 18:14:08 +0000 (20:14 +0200)
committerCarlos Lopez <carlos@pcnuevo.(none)>
Sat, 1 Aug 2009 18:14:08 +0000 (20:14 +0200)
commit4be650adcbea49129f3869d8596255ace7f987b1
treeef2ee2c1543beb41503f8cb5436abce347e373eb
parentdc1319ebadcd6f7746f4faa43dcb2005f05c490d
parent3d0655b0728cc3b9d528375431f7b01a5d0b3d5b
Merge branch 'genete_master'