Merge in 'braa'.
Add 'bluediving'.

This is a dependency for 'bluemaho'.

It doesn't build on x86_64 architectures. There are some i686 object
files in the distribution. There might be source code for them. Fixing
this may take time.