merge from main branch

author Paul Brossier <piem@piem.org>

Thu, 25 Oct 2007 02:02:06 +0000 (04:02 +0200)

committer Paul Brossier <piem@piem.org>

Thu, 25 Oct 2007 02:02:06 +0000 (04:02 +0200)
author Paul Brossier <piem@piem.org>
Thu, 25 Oct 2007 02:02:06 +0000 (04:02 +0200)
committer Paul Brossier <piem@piem.org>
Thu, 25 Oct 2007 02:02:06 +0000 (04:02 +0200)
diff --cc python/test/run_all_tests
Simple merge
diff --cc swig/aubio.i
Simple merge
author	Paul Brossier <piem@piem.org>
	Thu, 25 Oct 2007 02:02:06 +0000 (04:02 +0200)
committer	Paul Brossier <piem@piem.org>
	Thu, 25 Oct 2007 02:02:06 +0000 (04:02 +0200)
		1	2
python/test/run_all_tests	patch \|	diff1 \|	diff2 \|	blob \| history
swig/aubio.i	patch \|	diff1 \|	diff2 \|	blob \| history