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)
commit52df932769235a78bcdc3f24cb9c30c65028bcf4
tree30dba51d5643305dcd97ad0104e7e5e4e8ced042
parentfa8c9000091ddaf612ea6a734c4b1471ff5c31a3
parentfd31b0b0fceccda45e1fa962d89f446951d97322
merge next minor changes from master