Merge branch 'next' into refs/top-bases/pu
commit791b099edec13ae7d47388ce083ce4257e21939b
authorPetr Baudis <pasky@suse.cz>
Thu, 2 Oct 2008 14:54:00 +0000 (2 16:54 +0200)
committerPetr Baudis <pasky@suse.cz>
Thu, 2 Oct 2008 14:54:00 +0000 (2 16:54 +0200)
tree82ce24ac40c4da5eb24d139aa1fbb7ad515d3b64
parentb3a6f9712670da92055b23521d23f1a2f2eee0cc
parentb8de91d6f9248b619f5e710cc9856f082d685849
Merge branch 'next' into refs/top-bases/pu