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)
commite9a42a585dec26a8c0aabcfd6e12755f0f0f1156
treed7edd81cb10a2b214819ae0a7ac1715ecb80330e
parent62c72bf0bc6482003ae7423ecf727b2576fd5c46
parent46107da3448007ba863dc7fd01e11edab2deb402
Merge branch 'master' into zelgadis_master