Merge branch 'passthrough'
authorColin Guthrie <colin@mageia.org>
Sun, 15 May 2011 12:14:33 +0000 (13:14 +0100)
committerColin Guthrie <colin@mageia.org>
Sun, 15 May 2011 12:14:33 +0000 (13:14 +0100)

Trivial merge