Merge branch 'master' into amd64
authorJordan Gordeev <jgordeev@dir.bg>
Sun, 26 Apr 2009 19:56:25 +0000 (22:56 +0300)
committerJordan Gordeev <jgordeev@dir.bg>
Sun, 26 Apr 2009 19:56:25 +0000 (22:56 +0300)

Trivial merge