[SCM] openni/master: Merge commit 'upstream/1.5.2.23'

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

Imported Upstream version 1.5.2.23
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 265c5d33c9fab3eafdb6e698bd8f062e1579f4c5
X-Git-Newrev: 4a0a2ab0eaf769419441110b9731d9d081389c03

The following commit has been merged in the master branch:
commit aa366cf9f3a4b40e22a3c82cfa1bd38807e4e48a
Merge: 265c5d33c9fab3eafdb6e698bd8f062e1579f4c5 360c5e8b71c198cb0a7eabd0722a6496c5bc294e
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Mon Jul 2 11:40:30 2012 -0400

    Merge commit 'upstream/1.5.2.23'
    
    Upstream version 1.5.2.23


-- 
openni packaging