Merge remote-tracking branch 'arun/no-ramping'
authorColin Guthrie <cguthrie@mandriva.org>
Mon, 28 Feb 2011 19:39:10 +0000 (19:39 +0000)
committerColin Guthrie <cguthrie@mandriva.org>
Mon, 28 Feb 2011 19:39:10 +0000 (19:39 +0000)

Trivial merge