Merge branch 'uart_fixes'
authorSergey Kiselev <skiselev@gmail.com>
Thu, 12 Mar 2015 22:51:32 +0000 (15:51 -0700)
committerSergey Kiselev <skiselev@gmail.com>
Thu, 12 Mar 2015 22:51:32 +0000 (15:51 -0700)

Trivial merge