Merge branch 'master' into amd64
authorJordan Gordeev <jgordeev@dir.bg>
Fri, 5 Jun 2009 20:48:56 +0000 (23:48 +0300)
committerJordan Gordeev <jgordeev@dir.bg>
Fri, 5 Jun 2009 20:48:56 +0000 (23:48 +0300)

Trivial merge