Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 27 Jan 2014 09:17:48 +0000 (11:17 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 27 Jan 2014 09:17:48 +0000 (11:17 +0200)

Trivial merge