Merge remote-tracking branch 'hannes/for-christophe'
authorChristophe Varoqui <christophe.varoqui@opensvc.com>
Wed, 25 May 2011 06:35:34 +0000 (08:35 +0200)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Wed, 25 May 2011 06:35:34 +0000 (08:35 +0200)
Conflicts:
multipathd/main.c


No differences found