Merge branch 'pacemaker' into org.openembedded.dev
authorRoman I Khimov <khimov@altell.ru>
Mon, 29 Mar 2010 17:10:31 +0000 (21:10 +0400)
committerRoman I Khimov <khimov@altell.ru>
Mon, 29 Mar 2010 17:10:31 +0000 (21:10 +0400)

Trivial merge