Merge remote-tracking branch 'mkbosmans/merge/build-sys'
authorColin Guthrie <colin@mageia.org>
Wed, 22 Jun 2011 13:07:15 +0000 (14:07 +0100)
committerColin Guthrie <colin@mageia.org>
Wed, 22 Jun 2011 13:07:15 +0000 (14:07 +0100)

Trivial merge