Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2 * commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24': remove an old STOPSHIP comment
Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2 * commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24': remove an old STOPSHIP comment