Fix trivial merge error

This commit is contained in:
Sergey Petrunia 2009-01-29 11:47:20 +03:00
parent 7820ae5e25
commit af864fe91b