Merge branch 'master' into amd64
authorJordan Gordeev <jgordeev@dir.bg>
Mon, 6 Jul 2009 15:17:09 +0000 (18:17 +0300)
committerJordan Gordeev <jgordeev@dir.bg>
Mon, 6 Jul 2009 15:17:09 +0000 (18:17 +0300)

Trivial merge