Merge commit 'refs/top-bases/girocco' into girocco
commit7366f5d26a5a25c93314ff146ca736f78dcad372
authorPetr Baudis <pasky@suse.cz>
Sat, 4 Oct 2008 16:05:48 +0000 (4 18:05 +0200)
committerPetr Baudis <pasky@suse.cz>
Sat, 4 Oct 2008 16:05:48 +0000 (4 18:05 +0200)
tree3ebe462ac13dbaa10cf8c2a30b1572ce7ad5814a
parent10a69bc561a03fe2e7571f4d157b0291bb9f6dfe
parent8e64c48e42f029b59559c159ad4e95e4e3c18b23
Merge commit 'refs/top-bases/girocco' into girocco