Merge branch 'master' into modular
commitfa941fdbbe26c3d18c4e738a647d096b7e2fa406
authorMauro Iazzi <mauro.iazzi@gmail.com>
Mon, 30 Jun 2008 13:54:20 +0000 (30 15:54 +0200)
committerMauro Iazzi <mauro.iazzi@gmail.com>
Mon, 30 Jun 2008 13:54:20 +0000 (30 15:54 +0200)
treea9f8fdfdd5201f157a26f20c4392a14c9da2d31e
parent9b37d088500868a6cdbfe0ac1350896f4e033624
parent7bd1644cf314bdde5f9547e5dd30a02266e29faa
Merge branch 'master' into modular