Merge branch 'master' into amd64
authorJordan Gordeev <jgordeev@dir.bg>
Thu, 21 May 2009 16:24:49 +0000 (19:24 +0300)
committerJordan Gordeev <jgordeev@dir.bg>
Thu, 21 May 2009 16:24:49 +0000 (19:24 +0300)

Trivial merge