Merge commit 'cbd38328bc0e1c3d1585b41443cc9a1840bd2cf5'
authorDmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Tue, 9 Mar 2010 19:27:35 +0000 (22:27 +0300)
committerDmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Tue, 9 Mar 2010 19:27:35 +0000 (22:27 +0300)

Trivial merge