Merge branch 'master' into mainloop
authorPatrik Gornicz <Gornicz.P@gmail.com>
Fri, 22 Aug 2008 02:11:52 +0000 (22:11 -0400)
committerPatrik Gornicz <Gornicz.P@gmail.com>
Fri, 22 Aug 2008 02:11:52 +0000 (22:11 -0400)

Trivial merge