Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 11 Jan 2013 10:27:43 +0000 (12:27 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 11 Jan 2013 10:27:43 +0000 (12:27 +0200)

Trivial merge