merge next minor changes from master
authorEugene Petrenko <eugene.petrenko@gmail.com>
Thu, 21 Jul 2011 12:24:10 +0000 (16:24 +0400)
committerEugene Petrenko <eugene.petrenko@gmail.com>
Thu, 21 Jul 2011 12:24:10 +0000 (16:24 +0400)

Trivial merge