Merge branch 'andy128k'
authorDmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Tue, 9 Mar 2010 19:28:36 +0000 (22:28 +0300)
committerDmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Tue, 9 Mar 2010 19:28:36 +0000 (22:28 +0300)

Trivial merge