Merge branch 'cipso_bug' of git://github.com/zos/smack into zos-cipso_bug
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 8 Oct 2013 14:36:32 +0000 (17:36 +0300)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 8 Oct 2013 14:36:32 +0000 (17:36 +0300)
commitc972464a05d0c4c02e7a61a3d2579c38519438ac
tree8061747096ef75b05a018193c8f94a2b2e25374a
parent4e4ea9142727ca7f14bf1d64cd81949b28bb1d0b
parentd45ffe9082243377cdba9a2d224bab0e110501e0
Merge branch 'cipso_bug' of git://github.com/zos/smack into zos-cipso_bug