Merge branch 'master' into amd64
authorJordan Gordeev <jgordeev@dir.bg>
Wed, 27 May 2009 11:20:27 +0000 (14:20 +0300)
committerJordan Gordeev <jgordeev@dir.bg>
Wed, 27 May 2009 11:20:27 +0000 (14:20 +0300)

Trivial merge