Merge branch '2991_label_redraw'
authorAndrew Borodin <aborodin@vmail.ru>
Mon, 8 Apr 2013 11:47:01 +0000 (8 15:47 +0400)
committerAndrew Borodin <aborodin@vmail.ru>
Mon, 8 Apr 2013 11:47:01 +0000 (8 15:47 +0400)

Trivial merge