[SCM] openni/master: Merge tag 'upstream/1.5.4.0'

[eighthave at users.alioth.debian.org]

Imported Upstream version 1.5.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 25dc990f4383cf69f49f35abce380e632aee5156
X-Git-Newrev: 431fcce92ab1f098e6261004f3eef4c16df66a6e

The following commit has been merged in the master branch:
commit 2785778cac1179d1d859b373755a8b335745cac9
Merge: 8562fe4aef1a4cfffd077de99ca274124f6b35ac 43fbd562b54223ed97d66b87f4017e723d7e7604
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Sun May 19 21:06:53 2013 -0400

    Merge tag 'upstream/1.5.4.0'
    
    Upstream version 1.5.4.0
    # gpg: Signature made Sun 19 May 2013 09:06:47 PM EDT using RSA key ID 374BBE81
    # gpg: Good signature from "Hans-Christoph Steiner <hans at at.or.at>"
    # gpg:                 aka "[jpeg image of size 5408]"
    # gpg:                 aka "Hans-Christoph Steiner <hs420 at nyu.edu>"
    # gpg:                 aka "Hans-Christoph Steiner <hans at eds.org>"
    # gpg:                 aka "Hans-Christoph Steiner <hans at guardianproject.info>"
    # gpg:                 aka "Hans-Christoph Steiner <hansi at nyu.edu>"
    # gpg:                 aka "Hans-Christoph Steiner <hans at guardianproject.info>"


-- 
openni packaging