[NetworkManager-openswan/f15/master: 3/3] Merge branch 'master' into f15

[Christopher Aillon]

commit c9690a6dd1b8ce1c2d68d30a73b8b5a80514c28d
Merge: d3c0788 cff2bde
Author: Christopher Aillon <caillon at redhat.com>
Date:   Sun Mar 27 18:06:13 2011 -0700

    Merge branch 'master' into f15
    
    Conflicts:
    	NetworkManager-openswan.spec
    	compile-errors.patch

 NetworkManager-openswan.spec |    7 +-
 compile-errors.patch         |    9 +-
 nm09.patch                   |  359 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 368 insertions(+), 7 deletions(-)
---