lbxproxy: Changes to 'master'

[Alan Coopersmith]

 di/pm.c      |    6 +++---
 di/wire.c    |    2 +-
 include/pm.h |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 11d60dbe2012ffdf3acdc9f1b859ac6b102f4eab
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed May 23 22:25:44 2012 -0700

    Add const qualifiers to silence some gcc -Wwrite-strings warnings
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 2d858f3bcfe9e3c9f56209624539df267e11a20c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed May 23 22:12:50 2012 -0700

    Cast pointer to long instead of int
    
    Matches the cast passed in ((pointer)(long) server->index on line 1276)
    Fixes gcc error:
    di/wire.c:1119:27: error: cast from pointer to integer of different size
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>