Merge branch 'master' into refs/top-bases/next
commit1e20c58a966507db4bc86af2809ae631066fbdc1
authorPetr Baudis <pasky@ucw.cz>
Mon, 2 Nov 2009 23:41:36 +0000 (3 00:41 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Mon, 2 Nov 2009 23:41:36 +0000 (3 00:41 +0100)
treea3d19282d7371c4b0ae3cb21ec117f41bc7c0fb7
parenta6b044d8927c0a2527dbe7674fb9eeff50a78757
parent7e32df2c17847385dc4898e933fbf5d93b6d4322
Merge branch 'master' into refs/top-bases/next