Merge commit 'refs/top-bases/master'
commit22f20b491a0efc117fca3b9b5f0a72d0c20b460e
authorPetr Baudis <pasky@suse.cz>
Fri, 3 Oct 2008 15:11:51 +0000 (3 17:11 +0200)
committerPetr Baudis <pasky@suse.cz>
Fri, 3 Oct 2008 15:11:51 +0000 (3 17:11 +0200)
tree31f7a4455c6432bf1c562f4f8af37d3895a2d188
parent1b54d95ac913768c194487598454a727f5134a08
parent15bc25971bce9adb8613489021c9c89452add207
Merge commit 'refs/top-bases/master'