Merge branch 'andy128k' into andy128kr
authorDmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Mon, 18 Jan 2010 20:38:44 +0000 (23:38 +0300)
committerDmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Mon, 18 Jan 2010 20:38:44 +0000 (23:38 +0300)

Trivial merge