Merge branch 'master' of github.com:jriehl/numba

Conflicts:
	numba/functions.py
This commit is contained in:
Jon Riehl 2012-10-19 17:12:13 -05:00
commit 2b2407b82f

Diff content is not available