Merge branch 'master' into genete_setup_dialog
authorCarlos Lopez <carlos@pcnuevo.(none)>
Sat, 20 Jun 2009 08:11:27 +0000 (10:11 +0200)
committerCarlos Lopez <carlos@pcnuevo.(none)>
Sat, 20 Jun 2009 08:11:27 +0000 (10:11 +0200)
commitb0212b80e88492fb1fb98086dabb519ea901045e
tree867c690057c7066514a34c9d8c55f97a07745d85
parent970dffd6d364d177f772abccaffaad7a7d0d5bd6
parent3ff4f5ed21761e28999d5e355c3fafe95cfd081b
Merge branch 'master' into genete_setup_dialog