Merge branch 'core/resources' into x86/core
authorIngo Molnar <mingo@elte.hu>
Thu, 4 Sep 2008 19:04:04 +0000 (21:04 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 4 Sep 2008 19:04:04 +0000 (21:04 +0200)
commit8040d77688014987ca5738bf1731db72ab273441
tree99caf0f4ca88eeeb6e2b812a4002c5c0387f3ef9
parentfb481dd56adf3c5b0993b8f052cc9ba966e3959d
parent268364a0f48aee2f851f9d1ef8a6cda0f3039ef1
Merge branch 'core/resources' into x86/core