Merge branch 'master' into amd64
authorJordan Gordeev <jgordeev@dir.bg>
Mon, 27 Apr 2009 11:16:33 +0000 (14:16 +0300)
committerJordan Gordeev <jgordeev@dir.bg>
Mon, 27 Apr 2009 11:16:33 +0000 (14:16 +0300)

Trivial merge