[RFC] PR1118: Synchronize CACAO sections with icedtea7

[Stefan Ring]

> Committed as:
>
> http://icedtea.classpath.org/hg/icedtea6/rev/b2594f302584

Thanks.

> I added the cacao -> cacao/cacao change back which you removed

Arghh, I must have lost track of where and when it was added or
removed and why :).

In case you haven't noticed, I have also updated the corresponding
patches for 7 here:
https://bitbucket.org/Ringdingcoder/icedtea7/changeset/f68fa9be60b2ecce5aaf586430b7cbc57273def0
+ its parent

They look pretty good to me, but you might want to scrutinize a bit.

Cheers