Merge branch 'master' into zelgadis_master
authorKonstantin Dmitriev <ksee.zelgadis@gmail.com>
Thu, 16 Jul 2009 13:21:26 +0000 (20:21 +0700)
committerKonstantin Dmitriev <ksee.zelgadis@gmail.com>
Thu, 16 Jul 2009 13:21:26 +0000 (20:21 +0700)

Trivial merge