Merge branch 'master' into amd64
authorJordan Gordeev <jgordeev@dir.bg>
Wed, 13 May 2009 14:19:59 +0000 (17:19 +0300)
committerJordan Gordeev <jgordeev@dir.bg>
Wed, 13 May 2009 14:19:59 +0000 (17:19 +0300)

Trivial merge