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)

Trivial merge