Merge branch 'mmci' into fixes

This commit is contained in:
Russell King 2011-01-25 21:18:11 +00:00
commit 2f8e728560
2 changed files with 21 additions and 82 deletions