Merge branch 'devel-stable' into devel

This commit is contained in:
Russell King 2010-10-19 22:06:36 +01:00
commit 809b4e00ba
706 changed files with 22821 additions and 6981 deletions