Merge branch 'origin'
commita69512bddaf2b240e75d66def3af074ab405820a
authorJakub Narebski <jnareb@gmail.com>
Wed, 16 Aug 2006 10:09:11 +0000 (16 12:09 +0200)
committerJakub Narebski <jnareb@gmail.com>
Wed, 16 Aug 2006 10:09:11 +0000 (16 12:09 +0200)
treef195a41d41f4c0c33d837f55140ed11345b3f0ae
parentf87d62d42d4904eb7786c17cba613e0489e31262
parent1c2a4f5addce479c619057c6cdc841802139982f
Merge branch 'origin'