Merge branch 'master' into amd64
authorJordan Gordeev <jgordeev@dir.bg>
Sat, 2 May 2009 19:08:23 +0000 (22:08 +0300)
committerJordan Gordeev <jgordeev@dir.bg>
Sat, 2 May 2009 19:08:23 +0000 (22:08 +0300)

Trivial merge