Merge branch 'master' into ladiv5
commitf9715da99263a67c1adeb80485cc28cffe53392d
authorNedko Arnaudov <nedko@arnaudov.name>
Thu, 27 Nov 2008 14:25:19 +0000 (27 16:25 +0200)
committerNedko Arnaudov <nedko@arnaudov.name>
Thu, 27 Nov 2008 14:25:19 +0000 (27 16:25 +0200)
treeb2467c07f1ce6cda73854399304ef501ee7cb877
parente29fd19a7e4dd4ea3be68ff66f8562dd2ebf6d66
parentfaa66d9311976fd9cc98beb7a14142a25dd802bc
Merge branch 'master' into ladi