Merge branch 'modular' into multiple-inheritance
commit1e8d19fc3fc5199417834df6c720962d2a9b3b37
authorMauro Iazzi <mauro.iazzi@gmail.com>
Thu, 17 Jul 2008 10:56:59 +0000 (17 12:56 +0200)
committerMauro Iazzi <mauro.iazzi@gmail.com>
Thu, 17 Jul 2008 10:56:59 +0000 (17 12:56 +0200)
tree7b06b2f5b01f36896b10278d72500915fac7bb02
parentf9abf16ec196cc3bfc447f72e39d4b7c1c3fa045
parent492d9d2eb2e73bd5e9ac7768245dc85726a7c29b
Merge branch 'modular' into multiple-inheritance