Merge branch 'origin'
commit1aaf48cfce3db2a28e46a820796976eaf3cf7cdb
authorJakub Narebski <jnareb@gmail.com>
Mon, 17 Jul 2006 20:50:58 +0000 (17 22:50 +0200)
committerJakub Narebski <jnareb@gmail.com>
Mon, 17 Jul 2006 20:50:58 +0000 (17 22:50 +0200)
tree22f2ceb1019de1fa335e4f31f5fa61f84b231f13
parente2c15fa4548b5bee5af8d243de09b6fb8d74db1e
parentb9718d41c7e9c171e432bafac97a33be36f0e2bf
Merge branch 'origin'