merge
commita37fd1e6937a774ad89541f3452edee1e3be0a14
authorEvgeniy Vodolazskiy <waterlaz@gmail.com>
Thu, 11 Nov 2010 14:40:33 +0000 (11 16:40 +0200)
committerEvgeniy Vodolazskiy <waterlaz@gmail.com>
Thu, 11 Nov 2010 14:40:33 +0000 (11 16:40 +0200)
treea8bf75d0868c8a8362847185c72bdee90878947f
parentc0a1e2b8b12eaf282cb546fe56674af3b6795317
parent2f1410744a645f9746ff3b728fa318af84c5bfa5
merge