Merge branches 'master-cosmetic' and 'feature-bot-name' of git://repo.or.cz/0verkill
commit0f852cd07e87f0521b4515df5414f7bfc129a802
authorMarek Vasut <marek.vasut@gmail.com>
Sun, 16 May 2010 00:05:52 +0000 (16 02:05 +0200)
committerMarek Vasut <marek.vasut@gmail.com>
Sun, 16 May 2010 00:05:52 +0000 (16 02:05 +0200)
treeca61e910177af4e1daf68f587cdea2c73e8a083b
parent7b2e8dd12b31e5797accb1e9b0a192ec99000258
parentb9baf7b4b0c51c51bfcd72c949894d7bc5e9ab61
Merge branches 'master-cosmetic' and 'feature-bot-name' of git://repo.or.cz/0verkill