Merge commit 'upstream/0.4.0'
authorIustin Pop <iusty@k1024.org>
Mon, 30 Jun 2008 21:03:47 +0000 (23:03 +0200)
committerIustin Pop <iusty@k1024.org>
Mon, 30 Jun 2008 21:03:47 +0000 (23:03 +0200)
commit74a3ca4bde530d13b278dad0c2cd4776ea6908f9
treea22f54bc052ec59b3d15d13253428fb6e9f5787b
parent90391a75170a464a63e04603fb0796c22cd5a51b
parent3e48adc322cdeef188edb900b9d4f6bc6013ffda
Merge commit 'upstream/0.4.0'