aquamarine: Changes to 'upstream-unstable'

[David Nusinow]

New branch 'upstream-unstable' available with the following commits:


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]