Merge branch 'master' of http://nubati.net/git/e-DoKo
authorArun Persaud <arun@nubati.net>
Sat, 28 Jun 2008 11:23:28 +0000 (04:23 -0700)
committerArun Persaud <arun@nubati.net>
Sat, 28 Jun 2008 11:23:28 +0000 (04:23 -0700)

Trivial merge