Merge branch 'devel-stable' into devel

This commit is contained in:
Russell King 2010-05-24 23:08:52 +01:00
commit 119c4b1257
154 changed files with 6214 additions and 4196 deletions

Some files were not shown because too many files have changed in this diff Show more