Merge from ichernetsky
authorDmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Sat, 19 Sep 2009 05:12:05 +0000 (09:12 +0400)
committerDmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Sat, 19 Sep 2009 05:12:05 +0000 (09:12 +0400)

Trivial merge