[SCM] mma/master: Merge commit 'upstream/1.7'

[bolangi-guest at users.alioth.debian.org]

Imported Upstream version 1.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9afbbcb2f65d22b8ab586b50c6e93382a07a8258
X-Git-Newrev: eac59d7be1265ccdc9b834c91f8487342a19e520

The following commit has been merged in the master branch:
commit eac59d7be1265ccdc9b834c91f8487342a19e520
Merge: 9afbbcb2f65d22b8ab586b50c6e93382a07a8258 36970954d88a3b232bb3bc13b501002d88adfb33
Author: Joel Roth <joelz at pobox.com>
Date:   Mon Jan 31 17:38:52 2011 -1000

    Merge commit 'upstream/1.7'


-- 
mma packaging