Both definitions are accepted by AHD4:

http://www.bartleby.com/61/73/T0377300.html

Can any of our etymologists tell us which came first?