merging from master
authorEugene Gagarin <mosfet07@ya.ru>
Tue, 3 Mar 2009 08:27:00 +0000 (11:27 +0300)
committerEugene Gagarin <mosfet07@ya.ru>
Tue, 3 Mar 2009 08:27:00 +0000 (11:27 +0300)
commit9a45bfc22bfbcdca0f07e427bada5ffd850bbba7
tree98c955e7dc8b725574efcd951f07a5c8378e99b4
parentbb5ee4c1c96ee871d6653b812b05aacd61613f45
parentbb69e7d3082fa2379948c249153a6948f2aa30b2
merging from master