Merge branch 'newacpi+'
authorAlexander Polakov <polachok@gmail.com>
Sun, 8 Nov 2009 22:18:23 +0000 (01:18 +0300)
committerAlexander Polakov <polachok@gmail.com>
Sun, 8 Nov 2009 22:18:23 +0000 (01:18 +0300)

Trivial merge