asd
asd
Merge branch 'master' of git://github.com/lucazade/archos

Conflicts:
	conf/.bashrc