Merged in...

Merged in lukegluke/apps/lukegluke/correct-copypaste-typo-in-comments-in-co-1497814194757 (pull request #89)

correct copy-paste typo in comments in composite_main.c

Approved-by: Gregory Nutt <gnutt@nuttx.org>