Merge branch 'master' into genete_setup_dialog
authorCarlos Lopez <carlos@pcnuevo.(none)>
Sat, 20 Jun 2009 12:15:37 +0000 (14:15 +0200)
committerCarlos Lopez <carlos@pcnuevo.(none)>
Sat, 20 Jun 2009 12:15:37 +0000 (14:15 +0200)
commit429a714273c61bfadf0f8f373403760910f75eef
tree174c370d047c6eae8aa4958435202a65ca2e71b8
parentb0212b80e88492fb1fb98086dabb519ea901045e
parentd7342f658534a6a4e7758b404e655b8b6e80355c
Merge branch 'master' into genete_setup_dialog