Merge commit 'refs/top-bases/girocco' into girocco
commit1ebff17d8c8d2bdcafc1e1eee48455da2ad8db3d
authorPetr Baudis <pasky@ucw.cz>
Tue, 3 Nov 2009 00:18:58 +0000 (3 01:18 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Tue, 3 Nov 2009 00:18:58 +0000 (3 01:18 +0100)
tree667493a5301d912634eb2e07635042edcdfc4fcb
parent89dced97ba19734034b6777f8f5f33049876399f
parentd2dad6a8b6b663d7cbe2b0bf62533ece8e7e8afb
Merge commit 'refs/top-bases/girocco' into girocco