libXTrap: Changes to 'master'

[Alan Coopersmith]

 src/XEConTxt.c |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit b9d8ee673b4296d0962bfdc63e5b1b82590cfdf6
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Fri Jul 20 23:41:19 2012 +0200

    Remove unnecessary memset return value casts to void.
    
    Signed-off-by: Thomas Klausner <wiz at NetBSD.org>
    Reviewed-by: Rémi Cardona <remi.cardona at free.fr>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 45a8bd9a1ebf4f829d0f837beba2bb2b846fc834
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Fri Jul 20 23:41:18 2012 +0200

    Fix memset usage.
    
    From Joerg Sonnenberger <joerg at NetBSD.org>
    
    Signed-off-by: Thomas Klausner <wiz at NetBSD.org>
    Reviewed-by: Rémi Cardona <remi.cardona at free.fr>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>