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)
commitde98052933f534a03a291513f2060893b4eb314c
treec3799fc97854df5039dbbe315fb83f0ab9a22c86
parentc0a92138b545b25bd7c99502b25fd9fbcaf1b328
parent61f530a849ab720f3bf02a20be5658d484091f17
Merge remote-tracking branch 'hannes/for-christophe'

Conflicts:
multipathd/main.c
multipathd/main.c