Merge branch 'master' into devel

This commit is contained in:
Russell King 2009-12-13 19:39:35 +00:00
commit fc7736688b
16 changed files with 134 additions and 85 deletions