am 559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)
Merge commit '559f26b0a5e80da467d97d42280c22e5044d7f30' into eclair * commit '559f26b0a5e80da467d97d42280c22e5044d7f30': Move to 1.6_r2 (DO NOT MERGE)
This commit is contained in: