This commit was manufactured by cvs2svn to create tag 'Root_pr1002248'.
*** empty log message ***
Fix submited by Michael Bargeron to allow multiple inheritance.
added jpeg support