4802 commits

Author	SHA1	Message	Date
athile	d67f0c74b0	Merge remote branch 'upstream/master'	2010-06-27 14:10:46 -07:00
Marc Zinnschlag	e4f85cb3e6	directory structure reorganisation (still missing the mangle stuff)	2010-06-25 22:28:59 +02:00