Merge.
authorRichard W.M. Jones <rjones@redhat.com>
Fri, 3 Jul 2009 19:00:50 +0000 (20:00 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Fri, 3 Jul 2009 19:00:50 +0000 (20:00 +0100)
commit589c1614e434854a168b5581e00a070073a5020a
tree9e47dca74a7dad287040964c4634ec415b819af6
parentb63b0e1f7d90dc601cdbd613375a140a14706cbe
parent3326707d2c81caadb214d41e3d2d4cce7a2bce95
Merge.