Merged in rgilham/bertos_trunk/keyboard (pull request #1)
Merged in rgilham/bertos_trunk/graphic (pull request #2)