Merge branch 'dev'0.4
commit9495b517dbee599f0dc7e923486ef5e139a77186
authorPasqualino Ferrentino <lino@bricioline.it>
Wed, 22 Aug 2007 15:02:57 +0000 (22 17:02 +0200)
committerPasqualino Ferrentino <lino@bricioline.it>
Wed, 22 Aug 2007 15:02:57 +0000 (22 17:02 +0200)
tree7dbe344deed80fdb465f14606d2d35eefc8ce722
parent46288b0ba7138d99cedf2a2d85ea1090c9644de6
parentff2d25634f047857b5ea97ce51e5a3a0ed753861
Merge branch 'dev'