Merge branch 'master' of /home/jmf/repos/koha-rm-root.git/
authorJoshua Ferraro <jmf@liblime.com>
Wed, 21 Nov 2007 20:13:27 +0000 (14:13 -0600)
committerJoshua Ferraro <jmf@liblime.com>
Wed, 21 Nov 2007 20:13:27 +0000 (14:13 -0600)

Trivial merge