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)

Trivial merge