Merge remote-tracking branch 'andy128k/master'
authorDmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Sat, 2 Apr 2011 19:03:51 +0000 (23:03 +0400)
committerDmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Sat, 2 Apr 2011 19:03:51 +0000 (23:03 +0400)

Trivial merge