merge by hand - fix up rejections in Documentation/DocBook/Makefile
authorJames Bottomley <jejb@titanic.(none)>
Fri, 20 May 2005 20:27:44 +0000 (15:27 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Fri, 20 May 2005 20:27:44 +0000 (15:27 -0500)

Trivial merge