[SCM] scenic/master: Merge commit 'upstream/0.6.4'

[js at users.alioth.debian.org]

Imported Upstream version 0.6.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5a420851dd70e2f3ff37f422c97c4d3b1e4fffe3
X-Git-Newrev: 08b622e5aeb494781cf514f346a8157fb964249f

The following commit has been merged in the master branch:
commit a9e08293833b46277c33618b991a91d49af2b6ce
Merge: 08e65d4136a75568b141cbc42ec3570a17d762e8 be9efc8d7becab5463369e1b5d91f19c92dccdb1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Apr 13 12:58:14 2011 +0200

    Merge commit 'upstream/0.6.4'


-- 
scenic packaging