Merge mainline into usb
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 20 Aug 2010 18:12:26 +0000 (20:12 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 20 Aug 2010 18:12:26 +0000 (20:12 +0200)
1  2 
conf/i386-pc.rmk

Simple merge