K 10
svn:author
V 5
simon
K 8
svn:date
V 27
2006-07-30T14:17:54.000000Z
K 7
svn:log
V 286
Resolve conflicts after import of OpenSSL 0.9.8b.

This was missed the first time around since eng_padlock.c was not part
of OpenSSL 0.9.7e and therefor did not have the v0_9_7e CVS tag used
during original resolve of conflicts.

Noticed by:	Antoine Brodin <antoine.brodin@laposte.net>

END